Merge pull request #8049 from smarterclayton/normalize_release

release: Normalize how release branch jobs pass args to ci-operator
openshift · Mar 31, 2020 · e7e60cf · e7e60cf
2 parents 521081c + cb90a2f
commit e7e60cf
Show file tree

Hide file tree

Showing 6 changed files with 762 additions and 703 deletions.
diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.1-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.1-periodics.yaml
@@ -9,7 +9,19 @@ periodics:
   name: promote-release-openshift-machine-os-content-e2e-aws-4.1
   spec:
     containers:
-    - command:
+    - args:
+      - --artifact-dir=$(ARTIFACTS)
+      - --kubeconfig=/etc/apici/kubeconfig
+      - --lease-server-password-file=/etc/boskos/password
+      - --lease-server-username=ci
+      - --lease-server=https://boskos-ci.svc.ci.openshift.org
+      - --secret-dir=/usr/local/pull-secret
+      - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-cluster-profile
+      - --template=/usr/local/e2e-$(CLUSTER_TYPE)
+      - --input-hash=$(BUILD_ID)
+      - --input-hash=$(JOB_NAME)
+      - --promote
+      command:
       - /bin/bash
       - -c
       - |
@@ -39,24 +51,14 @@ periodics:
         fi
 
         # verify the tests pass
-        ci-operator \
-          --artifact-dir=$(ARTIFACTS) \
-          --kubeconfig=/etc/apici/kubeconfig \
-          --lease-server-password-file=/etc/boskos/password \
-          --lease-server-username=ci \
-          --lease-server=https://boskos-ci.svc.ci.openshift.org \
-          --secret-dir=/usr/local/pull-secret \
-          --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-cluster-profile \
-          --template=/usr/local/e2e-$(CLUSTER_TYPE) \
-          --input-hash=$(BUILD_ID) \
-          --input-hash=$(JOB_NAME) \
-          --promote
+        ci-operator $@
 
         # also tag the image into the art-latest stream
         oc tag "${to_quay}" "ocp/${BRANCH}-art-latest:${TAG}"
 
         # also tag the image into the ocp private stream
         oc tag "${to_quay}" "ocp-private/${BRANCH}-priv:${TAG}"
+      - ""
       env:
       - name: TAG_NS
         value: rhcos
@@ -651,7 +653,18 @@ periodics:
   name: release-openshift-origin-installer-e2e-aws-upgrade-4.1-stable-to-4.1-nightly
   spec:
     containers:
-    - command:
+    - args:
+      - --artifact-dir=$(ARTIFACTS)
+      - --kubeconfig=/etc/apici/kubeconfig
+      - --lease-server-password-file=/etc/boskos/password
+      - --lease-server-username=ci
+      - --lease-server=https://boskos-ci.svc.ci.openshift.org
+      - --secret-dir=/usr/local/pull-secret
+      - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile
+      - --target=e2e-$(CLUSTER_TYPE)-upgrade
+      - --input-hash=$(BUILD_ID)
+      - --input-hash=$(JOB_NAME)
+      command:
       - /bin/bash
       - -c
       - |
@@ -683,17 +696,8 @@ periodics:
         # annotate the information about this job so that the release controller adds it to the upgrade graph
         oc annotate pj/${PROW_JOB_ID} "release.openshift.io/from-tag=${from}" "release.openshift.io/tag=${to}" "release.openshift.io/source=ocp/$(BRANCH)"
 
-        ci-operator \
-          --artifact-dir=$(ARTIFACTS) \
-          --kubeconfig=/etc/apici/kubeconfig \
-          --lease-server-password-file=/etc/boskos/password \
-          --lease-server-username=ci \
-          --lease-server=https://boskos-ci.svc.ci.openshift.org \
-          --secret-dir=/usr/local/pull-secret \
-          --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \
-          --target=e2e-$(CLUSTER_TYPE)-upgrade \
-          --input-hash=$(BUILD_ID) \
-          --input-hash=$(JOB_NAME)
+        ci-operator $@
+      - ""
       env:
       - name: BRANCH
         value: "4.1"
@@ -783,7 +787,18 @@ periodics:
   name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.1
   spec:
     containers:
-    - command:
+    - args:
+      - --artifact-dir=$(ARTIFACTS)
+      - --kubeconfig=/etc/apici/kubeconfig
+      - --lease-server-password-file=/etc/boskos/password
+      - --lease-server-username=ci
+      - --lease-server=https://boskos-ci.svc.ci.openshift.org
+      - --secret-dir=/usr/local/pull-secret
+      - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile
+      - --target=e2e-$(CLUSTER_TYPE)-upgrade
+      - --input-hash=$(BUILD_ID)
+      - --input-hash=$(JOB_NAME)
+      command:
       - /bin/bash
       - -c
       - |
@@ -815,17 +830,8 @@ periodics:
         # annotate the information about this job so that we can query for it
         oc annotate pj/${PROW_JOB_ID} "release.openshift.io/from-tag=${from}" "release.openshift.io/tag=${to}" "release.openshift.io/source=ocp/$(BRANCH)"
 
-        ci-operator \
-          --artifact-dir=$(ARTIFACTS) \
-          --kubeconfig=/etc/apici/kubeconfig \
-          --lease-server-password-file=/etc/boskos/password \
-          --lease-server-username=ci \
-          --lease-server=https://boskos-ci.svc.ci.openshift.org \
-          --secret-dir=/usr/local/pull-secret \
-          --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \
-          --target=e2e-$(CLUSTER_TYPE)-upgrade \
-          --input-hash=$(BUILD_ID) \
-          --input-hash=$(JOB_NAME)
+        ci-operator $@
+      - ""
       env:
       - name: BRANCH
         value: "4.1"