fix mirror error for invalid job name (openshift#31448)

Signed-off-by: clyang82 <[email protected]> Signed-off-by: clyang82 <[email protected]>
juanrh · Aug 18, 2022 · dde0755 · dde0755
1 parent ea863f0
commit dde0755
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/...ig/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-release-2.6.yaml b/...ig/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-release-2.6.yaml
@@ -121,7 +121,7 @@ tests:
   secrets:
   - mount_path: /etc/sonarcloud/
     name: acm-sonarcloud-token
-- as: 0.5.0-operator-image-mirror
+- as: release-260-operator-image-mirror
   postsubmit: true
   steps:
     dependencies:
@@ -131,7 +131,7 @@ tests:
       IMAGE_TAG: v0.5.0
       REGISTRY_ORG: stolostron
     workflow: ocm-ci-image-mirror
-- as: 0.5.0-manager-image-mirror
+- as: release-260-manager-image-mirror
   postsubmit: true
   steps:
     dependencies:
@@ -141,7 +141,7 @@ tests:
       IMAGE_TAG: v0.5.0
       REGISTRY_ORG: stolostron
     workflow: ocm-ci-image-mirror
-- as: 0.5.0-agent-image-mirror
+- as: release-260-agent-image-mirror
   postsubmit: true
   steps:
     dependencies:

diff --git a/...n/multicluster-global-hub/stolostron-multicluster-global-hub-release-2.6-postsubmits.yaml b/...n/multicluster-global-hub/stolostron-multicluster-global-hub-release-2.6-postsubmits.yaml
@@ -9,17 +9,19 @@ postsubmits:
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-stolostron-multicluster-global-hub-release-2.6-0.5.0-agent-image-mirror
+    name: branch-ci-stolostron-multicluster-global-hub-release-2.6-images
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
+        - --promote
         - --report-credentials-file=/etc/report/credentials
-        - --secret-dir=/secrets/ci-pull-credentials
-        - --target=0.5.0-agent-image-mirror
+        - --target=[images]
         command:
         - ci-operator
         image: ci-operator:latest
@@ -29,26 +31,26 @@ postsubmits:
           requests:
             cpu: 10m
         volumeMounts:
-        - mountPath: /secrets/ci-pull-credentials
-          name: ci-pull-credentials
-          readOnly: true
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
+        - mountPath: /etc/push-secret
+          name: push-secret
+          readOnly: true
         - mountPath: /etc/report
           name: result-aggregator
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
-      - name: ci-pull-credentials
-        secret:
-          secretName: ci-pull-credentials
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
+      - name: push-secret
+        secret:
+          secretName: registry-push-credentials-ci-central
       - name: result-aggregator
         secret:
           secretName: result-aggregator
@@ -63,15 +65,15 @@ postsubmits:
     labels:
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-stolostron-multicluster-global-hub-release-2.6-0.5.0-manager-image-mirror
+    name: branch-ci-stolostron-multicluster-global-hub-release-2.6-release-260-agent-image-mirror
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=0.5.0-manager-image-mirror
+        - --target=release-260-agent-image-mirror
         command:
         - ci-operator
         image: ci-operator:latest
@@ -115,15 +117,15 @@ postsubmits:
     labels:
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-stolostron-multicluster-global-hub-release-2.6-0.5.0-operator-image-mirror
+    name: branch-ci-stolostron-multicluster-global-hub-release-2.6-release-260-manager-image-mirror
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=0.5.0-operator-image-mirror
+        - --target=release-260-manager-image-mirror
         command:
         - ci-operator
         image: ci-operator:latest
@@ -165,19 +167,17 @@ postsubmits:
     decoration_config:
       skip_cloning: true
     labels:
-      ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-stolostron-multicluster-global-hub-release-2.6-images
+    name: branch-ci-stolostron-multicluster-global-hub-release-2.6-release-260-operator-image-mirror
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
-        - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
-        - --promote
         - --report-credentials-file=/etc/report/credentials
-        - --target=[images]
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=release-260-operator-image-mirror
         command:
         - ci-operator
         image: ci-operator:latest
@@ -187,26 +187,26 @@ postsubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
         - mountPath: /secrets/gcs
           name: gcs-credentials
           readOnly: true
         - mountPath: /etc/pull-secret
           name: pull-secret
           readOnly: true
-        - mountPath: /etc/push-secret
-          name: push-secret
-          readOnly: true
         - mountPath: /etc/report
           name: result-aggregator
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
       - name: pull-secret
         secret:
           secretName: registry-pull-credentials
-      - name: push-secret
-        secret:
-          secretName: registry-push-credentials-ci-central
       - name: result-aggregator
         secret:
           secretName: result-aggregator