From 214967d69405e1eaf4b13f7339efcaa9c9da0166 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 12 Nov 2019 14:18:13 +0100 Subject: [PATCH 1/9] 4.3 OKD: run e2e-aws test before promoting it to fcos namespace --- ...enshift-release-release-4.3-periodics.yaml | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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 4c335d4042404..c13194c460b0f 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 @@ -627,6 +627,7 @@ periodics: workdir: true interval: 15m labels: + ci.openshift.io/release-type: informing job-release: "4.3" name: promote-release-openshift-okd-machine-os-content-e2e-aws-4.3 spec: @@ -757,8 +758,27 @@ periodics: # debug output oc describe -n ${namespace} istag/machine-os-content:latest + + # Craft a release image + MOC_SHA256=$( oc get istag -n "${namespace}" istag/machine-os-content:latest -o template='{{ .image.metadata.name }}' ) + export RELEASE_IMAGE_LATEST=registry.svc.ci.openshift.org/${namespace}/release:latest + oc registry login + oc adm release new -n origin \ + --from-image-stream=$(BRANCH) \ + --to-image=${RELEASE_IMAGE_LATEST} \ + machine-os-content=registry.svc.ci.openshift.org/${namespace}/machine-os-content@${MOC_SHA256} + + # execute the test + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --namespace=${namespace} \ + --secret-dir=/usr/local/pull-secret \ + --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-cluster-profile \ + --target=e2e-$(CLUSTER_TYPE) + + # promote to fcos namespace oc tag ${namespace}/machine-os-content:latest fcos/machine-os-content:${BRANCH} - oc tag fcos/machine-os-content:${BRANCH} ${TAG_NS}/${BRANCH}:machine-os-content + oc tag fcos/machine-os-content:${BRANCH} ${namespace}/machine-os-content@${MOC_SHA256} env: - name: TAG_NS value: origin From c9194bfdf8db74c585c5d5d1fa0e7ac81e67bef6 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 10 Dec 2019 20:12:29 +0100 Subject: [PATCH 2/9] DONOTMERGE testing promotion job --- .../openshift-release-release-4.3-periodics.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 c13194c460b0f..c29cb33b8e9ba 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 @@ -629,6 +629,7 @@ periodics: labels: ci.openshift.io/release-type: informing job-release: "4.3" + pj-rehearse.openshift.io/can-be-rehearsed: "true" name: promote-release-openshift-okd-machine-os-content-e2e-aws-4.3 spec: containers: @@ -677,10 +678,10 @@ periodics: latest="$( oc get istag -n fcos ${TAG}:${BRANCH} --template '{{ index .image.dockerImageMetadata.Config.Labels "version" }} {{ index .image.dockerImageMetadata.Config.Labels "id-artifacts" }} {{ index .image.dockerImageMetadata.Config.Labels "id-machine-config-operator-rpms" }}' )" candidate="${build_id} ${origin_artifacts_id} ${origin_machine_config_operator_rpms_id}" echo "Comparing existing '$latest' against latest '$candidate'" - if [[ "${latest}" == "${candidate}" ]]; then - echo "No build necessary, content is up to date" - exit 0 - fi + # if [[ "${latest}" == "${candidate}" ]]; then + # echo "No build necessary, content is up to date" + # exit 0 + # fi curl -L https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd64 2>/dev/null >/tmp/bin/yq chmod ug+x $HOME/bin/yq @@ -761,6 +762,7 @@ periodics: # Craft a release image MOC_SHA256=$( oc get istag -n "${namespace}" istag/machine-os-content:latest -o template='{{ .image.metadata.name }}' ) + set -x export RELEASE_IMAGE_LATEST=registry.svc.ci.openshift.org/${namespace}/release:latest oc registry login oc adm release new -n origin \ @@ -777,8 +779,8 @@ periodics: --target=e2e-$(CLUSTER_TYPE) # promote to fcos namespace - oc tag ${namespace}/machine-os-content:latest fcos/machine-os-content:${BRANCH} - oc tag fcos/machine-os-content:${BRANCH} ${namespace}/machine-os-content@${MOC_SHA256} + #oc tag ${namespace}/machine-os-content:latest fcos/machine-os-content:${BRANCH} + #oc tag fcos/machine-os-content:${BRANCH} ${namespace}/machine-os-content@${MOC_SHA256} env: - name: TAG_NS value: origin From 9d2fbdc903eb39f73eda1bd32dca815a2c5a7c37 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 10 Dec 2019 20:25:36 +0100 Subject: [PATCH 3/9] fix oc get istag --- .../release/openshift-release-release-4.3-periodics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c29cb33b8e9ba..bcc7a6436af0a 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 @@ -761,8 +761,8 @@ periodics: oc describe -n ${namespace} istag/machine-os-content:latest # Craft a release image - MOC_SHA256=$( oc get istag -n "${namespace}" istag/machine-os-content:latest -o template='{{ .image.metadata.name }}' ) set -x + MOC_SHA256=$(oc get -n "${namespace}" istag/machine-os-content:latest -o template='{{ .image.metadata.name }}' ) export RELEASE_IMAGE_LATEST=registry.svc.ci.openshift.org/${namespace}/release:latest oc registry login oc adm release new -n origin \ From 66a094ca29d96c4f7d2cc3f3abea322c375639d7 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 10 Dec 2019 20:43:29 +0100 Subject: [PATCH 4/9] Fix ci-operator params --- .../release/openshift-release-release-4.3-periodics.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 bcc7a6436af0a..0aaddc918b28f 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 @@ -773,9 +773,10 @@ periodics: # execute the test ci-operator \ --artifact-dir=$(ARTIFACTS) \ - --namespace=${namespace} \ --secret-dir=/usr/local/pull-secret \ --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-cluster-profile \ + --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME) \ + --lease-server=http://boskos \ --target=e2e-$(CLUSTER_TYPE) # promote to fcos namespace From 95aed344b8fe793323ce8d97e50377e32937e828 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 10 Dec 2019 21:33:03 +0100 Subject: [PATCH 5/9] set template --- .../release/openshift-release-release-4.3-periodics.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0aaddc918b28f..9e9bed844aedb 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 @@ -775,9 +775,9 @@ periodics: --artifact-dir=$(ARTIFACTS) \ --secret-dir=/usr/local/pull-secret \ --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-cluster-profile \ + --template=/usr/local/e2e-aws \ --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME) \ - --lease-server=http://boskos \ - --target=e2e-$(CLUSTER_TYPE) + --lease-server=http://boskos # promote to fcos namespace #oc tag ${namespace}/machine-os-content:latest fcos/machine-os-content:${BRANCH} From 6dc18c54ea191ae1005da348a1a23d4e3c2ae256 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 10 Dec 2019 22:03:36 +0100 Subject: [PATCH 6/9] Use OKD config key --- .../release/openshift-release-release-4.3-periodics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9e9bed844aedb..55ea5135ea317 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 @@ -796,7 +796,7 @@ periodics: - name: CONFIG_SPEC valueFrom: configMapKeyRef: - key: openshift-origin-release-4.3.yaml + key: openshift-installer-fcos.yaml name: ci-operator-4.3-configs - name: JOB_NAME_SAFE value: e2e-aws From 42d18bf2d9b902264f31e2d5d090b20d719dc203 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 10 Dec 2019 22:09:03 +0100 Subject: [PATCH 7/9] Add target --- .../release/openshift-release-release-4.3-periodics.yaml | 1 + 1 file changed, 1 insertion(+) 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 55ea5135ea317..e9c86e32b58e0 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 @@ -776,6 +776,7 @@ periodics: --secret-dir=/usr/local/pull-secret \ --secret-dir=/usr/local/e2e-$(CLUSTER_TYPE)-cluster-profile \ --template=/usr/local/e2e-aws \ + --target=e2e-$(CLUSTER_TYPE) \ --input-hash=$(BUILD_ID) --input-hash=$(JOB_NAME) \ --lease-server=http://boskos From 5cea9bc2a440233c104b618a5115dd34261ec941 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 10 Dec 2019 22:10:21 +0100 Subject: [PATCH 8/9] Set custom CONFIG_SPEC --- ...enshift-release-release-4.3-periodics.yaml | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) 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 e9c86e32b58e0..4d2ce3748ebdb 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 @@ -795,10 +795,30 @@ periodics: - name: CLUSTER_TYPE value: aws - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: openshift-installer-fcos.yaml - name: ci-operator-4.3-configs + value: | + tag_specification: + name: "none" # don't import anything to avoid a race between 4.2 latest and the chosen version + namespace: ocp + build_root: + image_stream_tag: + cluster: https://api.ci.openshift.org + name: release + namespace: openshift + tag: golang-1.12 + resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi + tests: + - as: e2e-$(CLUSTER_TYPE) + commands: | + TEST_SUITE=openshift/conformance/parallel run-tests run-tests + openshift_installer: + cluster_profile: "$(CLUSTER_TYPE)" + upgrade: true - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND From 86ade0e80fe359a82d7af7af1b3b23c7ea6324a9 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 10 Dec 2019 22:41:46 +0100 Subject: [PATCH 9/9] Add RELEASE_IMAGE_INITIAL --- .../release/openshift-release-release-4.3-periodics.yaml | 1 + 1 file changed, 1 insertion(+) 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 4d2ce3748ebdb..a79697a13b76c 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 @@ -771,6 +771,7 @@ periodics: machine-os-content=registry.svc.ci.openshift.org/${namespace}/machine-os-content@${MOC_SHA256} # execute the test + export RELEASE_IMAGE_INITIAL=${RELEASE_IMAGE_LATEST} ci-operator \ --artifact-dir=$(ARTIFACTS) \ --secret-dir=/usr/local/pull-secret \