]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-container-*: make .yml filenames match job names 2249/head
authorDan Mick <dan.mick@redhat.com>
Thu, 30 May 2024 08:57:09 +0000 (01:57 -0700)
committerDan Mick <dan.mick@redhat.com>
Thu, 30 May 2024 09:15:14 +0000 (02:15 -0700)
Why intentionally confuse people?

Signed-off-by: Dan Mick <dan.mick@redhat.com>
ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-ceph-base-push-imgs-arm64.yml [new file with mode: 0644]
ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs.yml [deleted file]
ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-ceph-base-push-imgs.yml [new file with mode: 0644]
ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-push-imgs.yml [deleted file]

diff --git a/ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-ceph-base-push-imgs-arm64.yml b/ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-ceph-base-push-imgs-arm64.yml
new file mode 100644 (file)
index 0000000..37f13e0
--- /dev/null
@@ -0,0 +1,46 @@
+- job:
+    name: ceph-container-build-ceph-base-push-imgs-arm64
+    node: arm64 && xenial
+    project-type: freestyle
+    defaults: global
+    display-name: ceph-container-build-ceph-base-push-imgs-arm64
+    quiet-period: 5
+    block-downstream: false
+    block-upstream: false
+    retry-count: 3
+    properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 1
+          artifact-days-to-keep: 1
+          artifact-num-to-keep: 1
+      - github:
+          url: https://github.com/ceph/ceph-container
+
+    triggers:
+      - timed: '@daily'
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-container.git
+          branches:
+            - main
+          browser: auto
+          basedir: "ceph-container"
+          timeout: 20
+
+    builders:
+      - shell:
+          !include-raw:
+            - ../../../scripts/build_utils.sh
+            - ../../build/build
+
+    wrappers:
+      - inject-passwords:
+          global: true
+          mask-password-params: true
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: ceph-container-quay-io
+              username: REGISTRY_USERNAME
+              password: REGISTRY_PASSWORD
diff --git a/ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs.yml b/ceph-container-build-ceph-base-push-imgs-arm64/config/definitions/ceph-container-build-push-imgs.yml
deleted file mode 100644 (file)
index 37f13e0..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: ceph-container-build-ceph-base-push-imgs-arm64
-    node: arm64 && xenial
-    project-type: freestyle
-    defaults: global
-    display-name: ceph-container-build-ceph-base-push-imgs-arm64
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    retry-count: 3
-    properties:
-      - build-discarder:
-          days-to-keep: 1
-          num-to-keep: 1
-          artifact-days-to-keep: 1
-          artifact-num-to-keep: 1
-      - github:
-          url: https://github.com/ceph/ceph-container
-
-    triggers:
-      - timed: '@daily'
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-container.git
-          branches:
-            - main
-          browser: auto
-          basedir: "ceph-container"
-          timeout: 20
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/build
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: ceph-container-quay-io
-              username: REGISTRY_USERNAME
-              password: REGISTRY_PASSWORD
diff --git a/ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-ceph-base-push-imgs.yml b/ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-ceph-base-push-imgs.yml
new file mode 100644 (file)
index 0000000..1f72526
--- /dev/null
@@ -0,0 +1,46 @@
+- job:
+    name: ceph-container-build-ceph-base-push-imgs
+    node: huge && trusty && x86_64
+    project-type: freestyle
+    defaults: global
+    display-name: ceph-container-build-ceph-base-push-imgs
+    quiet-period: 5
+    block-downstream: false
+    block-upstream: false
+    retry-count: 3
+    properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 1
+          artifact-days-to-keep: 1
+          artifact-num-to-keep: 1
+      - github:
+          url: https://github.com/ceph/ceph-container
+
+    triggers:
+      - timed: '@daily'
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-container.git
+          branches:
+            - main
+          browser: auto
+          basedir: "ceph-container"
+          timeout: 20
+
+    builders:
+      - shell:
+          !include-raw:
+            - ../../../scripts/build_utils.sh
+            - ../../build/build
+
+    wrappers:
+      - inject-passwords:
+          global: true
+          mask-password-params: true
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: ceph-container-quay-io
+              username: REGISTRY_USERNAME
+              password: REGISTRY_PASSWORD
diff --git a/ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-push-imgs.yml b/ceph-container-build-ceph-base-push-imgs/config/definitions/ceph-container-build-push-imgs.yml
deleted file mode 100644 (file)
index 1f72526..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: ceph-container-build-ceph-base-push-imgs
-    node: huge && trusty && x86_64
-    project-type: freestyle
-    defaults: global
-    display-name: ceph-container-build-ceph-base-push-imgs
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    retry-count: 3
-    properties:
-      - build-discarder:
-          days-to-keep: 1
-          num-to-keep: 1
-          artifact-days-to-keep: 1
-          artifact-num-to-keep: 1
-      - github:
-          url: https://github.com/ceph/ceph-container
-
-    triggers:
-      - timed: '@daily'
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-container.git
-          branches:
-            - main
-          browser: auto
-          basedir: "ceph-container"
-          timeout: 20
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/build
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: ceph-container-quay-io
-              username: REGISTRY_USERNAME
-              password: REGISTRY_PASSWORD