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..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 @@ -627,7 +627,9 @@ periodics: workdir: true interval: 15m 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: @@ -676,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 @@ -757,8 +759,31 @@ periodics: # debug output oc describe -n ${namespace} istag/machine-os-content:latest - 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 + + # Craft a release image + 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-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 + export RELEASE_IMAGE_INITIAL=${RELEASE_IMAGE_LATEST} + ci-operator \ + --artifact-dir=$(ARTIFACTS) \ + --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 + + # 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} env: - name: TAG_NS value: origin @@ -771,10 +796,30 @@ periodics: - name: CLUSTER_TYPE value: aws - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: openshift-origin-release-4.3.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