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 index 9f0a279b5826..006cb4e9b3a3 100644 --- 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" diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml index f625b7b4ba66..a3064864d9e0 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml @@ -9,7 +9,19 @@ periodics: name: promote-release-openshift-machine-os-content-e2e-aws-4.2 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 @@ -614,7 +616,16 @@ periodics: name: release-openshift-origin-installer-old-rhcos-e2e-aws-4.2 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 + command: - /bin/bash - -c - | @@ -643,16 +654,8 @@ periodics: --exclude=machine-config-operator # execute the test - 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 \ - --namespace=${namespace} \ - --secret-dir=/usr/local/pull-secret \ - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \ - --target=e2e-$(CLUSTER_TYPE)-upgrade + ci-operator $@ --namespace=${namespace} + - "" env: - name: FROM_BRANCH value: "4.1" @@ -2781,7 +2784,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.2-stable-to-4.2-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 - | @@ -2813,17 +2827,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.2" @@ -3597,7 +3602,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.1-stable-to-4.2-ci 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 - | @@ -3629,17 +3645,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" @@ -3730,7 +3737,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.1-to-4.2 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 - | @@ -3762,17 +3780,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" @@ -3851,7 +3860,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.2 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 - | @@ -3883,17 +3903,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.2" @@ -4081,7 +4092,18 @@ periodics: name: release-openshift-origin-installer-e2e-gcp-upgrade-4.2 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 - | @@ -4113,17 +4135,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.2" @@ -4202,7 +4215,18 @@ periodics: name: release-openshift-origin-installer-e2e-azure-upgrade-4.2 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-azure-upgrade-cluster-profile + - --target=e2e-azure-upgrade + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -4234,17 +4258,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-azure-upgrade-cluster-profile \ - --target=e2e-azure-upgrade \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) + ci-operator $@ + - "" env: - name: BRANCH value: "4.2" diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml index 562a3838dc92..1d9e27ec3802 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml @@ -8,27 +8,22 @@ periodics: name: endurance-upgrade-aws-4.3 spec: containers: - - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -euo pipefail - - 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/ci-credentials \ - --secret-dir=/usr/local/endurance-cluster-credentials-aws \ - --secret-dir=/usr/local/aws-openshift-llc-account-credentials \ - --secret-dir=/usr/local/pull-secret \ - --template=/usr/local/endurance-test/endurance-test.yaml \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) \ - --target=endurance-test + - 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/ci-credentials + - --secret-dir=/usr/local/endurance-cluster-credentials-aws + - --secret-dir=/usr/local/aws-openshift-llc-account-credentials + - --secret-dir=/usr/local/pull-secret + - --template=/usr/local/endurance-test/endurance-test.yaml + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --target=endurance-test + command: + - ci-operator env: - name: BRANCH value: "4.3" @@ -120,27 +115,22 @@ periodics: name: endurance-e2e-aws-4.3 spec: containers: - - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -euo pipefail - - 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/ci-credentials \ - --secret-dir=/usr/local/endurance-cluster-credentials-aws \ - --secret-dir=/usr/local/aws-openshift-llc-account-credentials \ - --secret-dir=/usr/local/pull-secret \ - --template=/usr/local/endurance-test/endurance-test.yaml \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) \ - --target=endurance-test + - 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/ci-credentials + - --secret-dir=/usr/local/endurance-cluster-credentials-aws + - --secret-dir=/usr/local/aws-openshift-llc-account-credentials + - --secret-dir=/usr/local/pull-secret + - --template=/usr/local/endurance-test/endurance-test.yaml + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --target=endurance-test + command: + - ci-operator env: - name: BRANCH value: "4.3" @@ -232,7 +222,21 @@ periodics: name: endurance-cluster-maintenance-aws-4.3 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/ci-credentials + - --secret-dir=/usr/local/endurance-cluster-credentials-aws + - --secret-dir=/usr/local/aws-openshift-llc-account-credentials + - --secret-dir=/usr/local/pull-secret + - --template=/usr/local/endurance-install/endurance-install.yaml + - --target=endurance-install + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -243,20 +247,7 @@ periodics: curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.3/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc chmod ug+x /tmp/bin/oc set +e - 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/ci-credentials \ - --secret-dir=/usr/local/endurance-cluster-credentials-aws \ - --secret-dir=/usr/local/aws-openshift-llc-account-credentials \ - --secret-dir=/usr/local/pull-secret \ - --template=/usr/local/endurance-install/endurance-install.yaml \ - --target=endurance-install \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) |& tee /tmp/ci-operator.log + ci-operator $@ |& tee /tmp/ci-operator.log rc=$? set -e namespace=$(grep "Using namespace" /tmp/ci-operator.log | awk '{print $NF}') @@ -266,6 +257,7 @@ periodics: sed -i s/endurance-cluster-credentials-aws-new/endurance-cluster-credentials-4.3-aws/ /tmp/secret.yaml oc apply -f /tmp/secret.yaml -n ci exit $rc + - "" env: - name: BRANCH value: "4.3" @@ -359,7 +351,20 @@ periodics: name: promote-release-openshift-machine-os-content-e2e-aws-4.3 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 + - --target=e2e-$(CLUSTER_TYPE) + - --template=/usr/local/e2e-$(CLUSTER_TYPE) + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --promote + command: - /bin/bash - -c - | @@ -389,25 +394,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 \ - --target=e2e-$(CLUSTER_TYPE) \ - --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 @@ -1033,7 +1027,16 @@ periodics: name: release-openshift-origin-installer-old-rhcos-e2e-aws-4.3 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 + command: - /bin/bash - -c - | @@ -1062,16 +1065,8 @@ periodics: --exclude=machine-config-operator # execute the test - 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 \ - --namespace=${namespace} \ - --secret-dir=/usr/local/pull-secret \ - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \ - --target=e2e-$(CLUSTER_TYPE)-upgrade + ci-operator $@ --namespace=${namespace} + - "" env: - name: FROM_BRANCH value: "4.2" @@ -4940,7 +4935,19 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-fips-4.3 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)-fips-cluster-profile + - --target=e2e-$(CLUSTER_TYPE)-fips + - --template=/usr/local/e2e-$(CLUSTER_TYPE)-fips + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -4972,18 +4979,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)-fips-cluster-profile \ - --target=e2e-$(CLUSTER_TYPE)-fips \ - --template=/usr/local/e2e-$(CLUSTER_TYPE)-fips \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) + ci-operator $@ + - "" env: - name: BRANCH value: "4.3" @@ -5414,7 +5411,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.2-to-4.3 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 - | @@ -5446,17 +5454,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.2" @@ -5549,7 +5548,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.1-to-4.2-to-4.3-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 - | @@ -5576,17 +5586,8 @@ periodics: fi export RELEASE_IMAGE_LATEST=$( python -c 'import json,sys; print json.load(open(sys.argv[1], "r"))["pullSpec"]' "${data}" ) - 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.2" @@ -5682,7 +5683,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.2-nightly-to-4.3-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 - | @@ -5714,17 +5726,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.3" @@ -5816,7 +5819,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.2-to-4.3 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 - | @@ -5848,17 +5862,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.2" @@ -5938,7 +5943,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.3 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 - | @@ -5970,17 +5986,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.3" @@ -6171,7 +6178,18 @@ periodics: name: release-openshift-origin-installer-e2e-gcp-upgrade-4.3 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 - | @@ -6203,17 +6221,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.3" @@ -6295,7 +6304,18 @@ periodics: name: release-openshift-origin-installer-e2e-azure-upgrade-4.3 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-azure-upgrade-cluster-profile + - --target=e2e-azure-upgrade + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -6327,17 +6347,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-azure-upgrade-cluster-profile \ - --target=e2e-azure-upgrade \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) \ + ci-operator $@ + - "" env: - name: BRANCH value: "4.3" diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml index 516b8aaf3126..1b5915f45096 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml @@ -8,25 +8,20 @@ periodics: name: endurance-upgrade-aws-4.4 spec: containers: - - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -euo pipefail - - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --lease-server=https://boskos-ci.svc.ci.openshift.org \ - --kubeconfig=/etc/apici/kubeconfig \ - --secret-dir=/usr/local/ci-credentials \ - --secret-dir=/usr/local/endurance-cluster-credentials-aws \ - --secret-dir=/usr/local/aws-openshift-llc-account-credentials \ - --secret-dir=/usr/local/pull-secret \ - --template=/usr/local/endurance-test/endurance-test.yaml \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) \ - --target=endurance-test + - args: + - --artifact-dir=$(ARTIFACTS) + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --kubeconfig=/etc/apici/kubeconfig + - --secret-dir=/usr/local/ci-credentials + - --secret-dir=/usr/local/endurance-cluster-credentials-aws + - --secret-dir=/usr/local/aws-openshift-llc-account-credentials + - --secret-dir=/usr/local/pull-secret + - --template=/usr/local/endurance-test/endurance-test.yaml + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --target=endurance-test + command: + - ci-operator env: - name: BRANCH value: "4.4" @@ -118,24 +113,19 @@ periodics: name: endurance-e2e-aws-4.4 spec: containers: - - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -euo pipefail - - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --kubeconfig=/etc/apici/kubeconfig \ - --secret-dir=/usr/local/ci-credentials \ - --secret-dir=/usr/local/endurance-cluster-credentials-aws \ - --secret-dir=/usr/local/aws-openshift-llc-account-credentials \ - --secret-dir=/usr/local/pull-secret \ - --template=/usr/local/endurance-test/endurance-test.yaml \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) \ - --target=endurance-test + - args: + - --artifact-dir=$(ARTIFACTS) + - --kubeconfig=/etc/apici/kubeconfig + - --secret-dir=/usr/local/ci-credentials + - --secret-dir=/usr/local/endurance-cluster-credentials-aws + - --secret-dir=/usr/local/aws-openshift-llc-account-credentials + - --secret-dir=/usr/local/pull-secret + - --template=/usr/local/endurance-test/endurance-test.yaml + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --target=endurance-test + command: + - ci-operator env: - name: BRANCH value: "4.4" @@ -227,7 +217,19 @@ periodics: name: endurance-cluster-maintenance-aws-4.4 spec: containers: - - command: + - args: + - --artifact-dir=$(ARTIFACTS) + - --lease-server=https://boskos-ci.svc.ci.openshift.org + - --kubeconfig=/etc/apici/kubeconfig + - --secret-dir=/usr/local/ci-credentials + - --secret-dir=/usr/local/endurance-cluster-credentials-aws + - --secret-dir=/usr/local/aws-openshift-llc-account-credentials + - --secret-dir=/usr/local/pull-secret + - --template=/usr/local/endurance-install/endurance-install.yaml + - --target=endurance-install + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -238,18 +240,7 @@ periodics: curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/linux/oc.tar.gz | tar xvzf - -C /tmp/bin/ oc chmod ug+x /tmp/bin/oc set +e - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --lease-server=https://boskos-ci.svc.ci.openshift.org \ - --kubeconfig=/etc/apici/kubeconfig \ - --secret-dir=/usr/local/ci-credentials \ - --secret-dir=/usr/local/endurance-cluster-credentials-aws \ - --secret-dir=/usr/local/aws-openshift-llc-account-credentials \ - --secret-dir=/usr/local/pull-secret \ - --template=/usr/local/endurance-install/endurance-install.yaml \ - --target=endurance-install \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) |& tee /tmp/ci-operator.log + ci-operator $@ |& tee /tmp/ci-operator.log rc=$? set -e namespace=$(grep "Using namespace" /tmp/ci-operator.log | awk '{print $NF}') @@ -259,6 +250,7 @@ periodics: sed -i s/endurance-cluster-credentials-aws-new/endurance-cluster-credentials-4.4-aws/ /tmp/secret.yaml oc apply -f /tmp/secret.yaml -n ci exit $rc + - "" env: - name: BRANCH value: "4.4" @@ -352,7 +344,20 @@ periodics: name: promote-release-openshift-machine-os-content-e2e-aws-4.4 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 + - --target=e2e-$(CLUSTER_TYPE) + - --template=/usr/local/e2e-$(CLUSTER_TYPE) + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + - --promote + command: - /bin/bash - -c - | @@ -382,25 +387,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 \ - --target=e2e-$(CLUSTER_TYPE) \ - --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 @@ -821,7 +815,18 @@ periodics: name: promote-release-openshift-okd-machine-os-content-e2e-aws-4.4 spec: containers: - - command: + - args: + - --artifact-dir=$(ARTIFACTS) + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME) + - --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/e2e-aws-cluster-profile + - --secret-dir=/usr/local/pull-secret + - --template=/usr/local/e2e-aws + command: - /bin/bash - -c - | @@ -899,19 +904,7 @@ periodics: oc registry login >/dev/null # run build to do the image imports - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \ - --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME) \ - --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/e2e-aws-cluster-profile \ - --secret-dir=/usr/local/pull-secret \ - --template=/usr/local/e2e-aws \ - --namespace=${namespace} \ - --target=[images] + ci-operator $@ --target=[images] --namespace=${namespace} function build { oc -n ${namespace} create -f $1 >/dev/null @@ -985,20 +978,8 @@ periodics: oc describe -n ${namespace} istag/pipeline:machine-os-content # run tests - ci-operator \ - --artifact-dir=$(ARTIFACTS) \ - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson \ - --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME) \ - --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/e2e-aws-cluster-profile \ - --secret-dir=/usr/local/pull-secret \ - --template=/usr/local/e2e-aws \ - --namespace=${namespace} \ - --target=e2e-aws \ - --promote + ci-operator $@ --target=e2e-aws --promote --namespace=${namespace} + - "" env: - name: TAG_NS value: origin @@ -1117,7 +1098,16 @@ periodics: name: release-openshift-origin-installer-old-rhcos-e2e-aws-4.4 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 + command: - /bin/bash - -c - | @@ -1146,16 +1136,8 @@ periodics: --exclude=machine-config-operator # execute the test - 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 \ - --namespace=${namespace} \ - --secret-dir=/usr/local/pull-secret \ - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \ - --target=e2e-$(CLUSTER_TYPE)-upgrade + ci-operator $@ --namespace=${namespace} + - "" env: - name: FROM_BRANCH value: "4.4" @@ -4327,7 +4309,19 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-fips-4.4 spec: containers: - - command: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --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)-fips-cluster-profile + - --target=e2e-$(CLUSTER_TYPE)-fips --template=/usr/local/e2e-$(CLUSTER_TYPE)-fips + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -4359,19 +4353,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) \ - --give-pr-author-access-to-namespace=true \ - --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)-fips-cluster-profile \ - --target=e2e-$(CLUSTER_TYPE)-fips \ - --template=/usr/local/e2e-$(CLUSTER_TYPE)-fips - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) + ci-operator $@ + - "" env: - name: BRANCH value: "4.4" @@ -5864,7 +5847,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.4-stable-to-4.4-ci 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 - | @@ -5896,17 +5890,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.4" @@ -5999,7 +5984,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.1-to-4.2-to-4.3-to-4.4-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 - | @@ -6035,17 +6031,8 @@ periodics: export RELEASE_IMAGE_LATEST=${next_2} export CONFIG_SPEC="${CONFIG_SPEC/RELEASE_IMAGES/$next_0,$next_1,$next_2}" - 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.2" @@ -6140,7 +6127,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.4-nightly-to-4.4-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 - | @@ -6172,17 +6170,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.4" @@ -6274,7 +6263,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.4-to-4.4 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 - | @@ -6306,17 +6306,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.4" @@ -6396,7 +6387,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.4 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 - | @@ -6428,17 +6430,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.4" @@ -6669,7 +6662,18 @@ periodics: name: release-openshift-origin-installer-e2e-gcp-upgrade-4.4 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 - | @@ -6701,17 +6705,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.4" @@ -6793,7 +6788,18 @@ periodics: name: release-openshift-origin-installer-e2e-azure-upgrade-4.4 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-azure-upgrade-cluster-profile + - --target=e2e-azure-upgrade + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -6825,17 +6831,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-azure-upgrade-cluster-profile \ - --target=e2e-azure-upgrade \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) + ci-operator $@ + - "" env: - name: BRANCH value: "4.4" diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml index 069ed16ecefc..6434cf7a0a80 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.5-periodics.yaml @@ -9,7 +9,18 @@ periodics: name: promote-release-openshift-machine-os-content-e2e-aws-4.5 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-aws-cluster-profile + - --template=/usr/local/e2e-aws + - --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME) + - --promote + command: - /bin/bash - -c - | @@ -39,23 +50,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-aws-cluster-profile \ - --template=/usr/local/e2e-aws \ - --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 @@ -707,7 +709,16 @@ periodics: name: release-openshift-origin-installer-old-rhcos-e2e-aws-4.5 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 + command: - /bin/bash - -c - | @@ -736,16 +747,8 @@ periodics: --exclude=machine-config-operator # execute the test - 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 \ - --namespace=${namespace} \ - --secret-dir=/usr/local/pull-secret \ - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \ - --target=e2e-$(CLUSTER_TYPE)-upgrade + ci-operator $@ --namespace=${namespace} + - "" env: - name: FROM_BRANCH value: "4.4" @@ -5060,7 +5063,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.2-to-4.3-to-4.4-to-4.5-ci 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 - | @@ -5096,17 +5110,8 @@ periodics: export RELEASE_IMAGE_LATEST=${next_2} export CONFIG_SPEC="${CONFIG_SPEC/RELEASE_IMAGES/$next_0,$next_1,$next_2}" - 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.2" @@ -5201,7 +5206,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.4-stable-to-4.5-ci 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 - | @@ -5233,17 +5249,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.4" @@ -5335,7 +5342,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.4-to-4.5 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 - | @@ -5367,17 +5385,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.4" @@ -5457,7 +5466,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.5 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 - | @@ -5489,17 +5509,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.5" @@ -5687,7 +5698,18 @@ periodics: name: release-openshift-origin-installer-e2e-gcp-upgrade-4.5 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 - | @@ -5719,17 +5741,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.5" @@ -5811,7 +5824,18 @@ periodics: name: release-openshift-origin-installer-e2e-azure-upgrade-4.5 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-azure-upgrade-cluster-profile + - --target=e2e-azure-upgrade + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -5843,17 +5867,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-azure-upgrade-cluster-profile \ - --target=e2e-azure-upgrade \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) + ci-operator $@ + - "" env: - name: BRANCH value: "4.5" diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml index 7c03c4152ba6..afb2b76dae3d 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml @@ -9,7 +9,18 @@ periodics: name: promote-release-openshift-machine-os-content-e2e-aws-4.6 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-aws-cluster-profile + - --template=/usr/local/e2e-aws + - --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME) + - --promote + command: - /bin/bash - -c - | @@ -39,23 +50,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-aws-cluster-profile \ - --template=/usr/local/e2e-aws \ - --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 @@ -707,7 +709,16 @@ periodics: name: release-openshift-origin-installer-old-rhcos-e2e-aws-4.6 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 + command: - /bin/bash - -c - | @@ -736,16 +747,8 @@ periodics: --exclude=machine-config-operator # execute the test - 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 \ - --namespace=${namespace} \ - --secret-dir=/usr/local/pull-secret \ - --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-upgrade-cluster-profile \ - --target=e2e-$(CLUSTER_TYPE)-upgrade + ci-operator $@ --namespace=${namespace} + - "" env: - name: FROM_BRANCH value: "4.5" @@ -5060,7 +5063,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.3-to-4.4-to-4.5-to-4.6-ci 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 - | @@ -5096,17 +5110,8 @@ periodics: export RELEASE_IMAGE_LATEST=${next_2} export CONFIG_SPEC="${CONFIG_SPEC/RELEASE_IMAGES/$next_0,$next_1,$next_2}" - 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.3" @@ -5201,7 +5206,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-4.5-stable-to-4.6-ci 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 - | @@ -5233,17 +5249,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.5" @@ -5335,7 +5342,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.5-to-4.6 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 - | @@ -5367,17 +5385,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.5" @@ -5457,7 +5466,18 @@ periodics: name: release-openshift-origin-installer-e2e-aws-upgrade-rollback-4.6 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 - | @@ -5489,17 +5509,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.6" @@ -5687,7 +5698,18 @@ periodics: name: release-openshift-origin-installer-e2e-gcp-upgrade-4.6 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 - | @@ -5719,17 +5741,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.6" @@ -5811,7 +5824,18 @@ periodics: name: release-openshift-origin-installer-e2e-azure-upgrade-4.6 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-azure-upgrade-cluster-profile + - --target=e2e-azure-upgrade + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: - /bin/bash - -c - | @@ -5843,17 +5867,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-azure-upgrade-cluster-profile \ - --target=e2e-azure-upgrade \ - --input-hash=$(BUILD_ID) \ - --input-hash=$(JOB_NAME) + ci-operator $@ + - "" env: - name: BRANCH value: "4.6"