diff --git a/ci-operator/config/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master.yaml b/ci-operator/config/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master.yaml index cc164e4d52345..4758e942e1434 100644 --- a/ci-operator/config/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master.yaml +++ b/ci-operator/config/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master.yaml @@ -25,10 +25,8 @@ images: cd - && \ rm -rf /tmp/oc from: src - to: test-bin + to: sro-test-bin promotion: - additional_images: - sro-test-bin: test-bin name: "4.11" namespace: ocp releases: @@ -53,13 +51,13 @@ tests: make lint container: clone: true - from: test-bin + from: sro-test-bin - as: helm-lint commands: | make helm-lint container: clone: true - from: test-bin + from: sro-test-bin - as: kube-lint commands: | make kube-lint @@ -90,7 +88,7 @@ tests: cd cluster-nfd-operator make deploy VERSION=4.9.0 oc apply -f config/samples/nfd.openshift.io_v1_nodefeaturediscovery.yaml - from: test-bin + from: sro-test-bin resources: requests: cpu: 300m @@ -102,7 +100,7 @@ tests: dependencies: - env: IMG name: special-resource-operator - from: test-bin + from: sro-test-bin resources: requests: cpu: 300m @@ -135,7 +133,7 @@ tests: cd cluster-nfd-operator make deploy VERSION=4.8.0 oc apply -f config/samples/nfd.openshift.io_v1_nodefeaturediscovery.yaml - from: test-bin + from: sro-test-bin resources: requests: cpu: 300m @@ -147,7 +145,7 @@ tests: dependencies: - env: IMG name: special-resource-operator - from: test-bin + from: sro-test-bin resources: requests: cpu: 300m diff --git a/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master-postsubmits.yaml index abe069309e857..b0af0c31556b7 100644 --- a/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master-postsubmits.yaml @@ -22,7 +22,6 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] - - --target=test-bin command: - ci-operator image: ci-operator:latest diff --git a/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master-presubmits.yaml index f39870eeeb7a1..25a228c7de0b0 100644 --- a/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-psap/special-resource-operator/openshift-psap-special-resource-operator-master-presubmits.yaml @@ -135,7 +135,6 @@ presubmits: - --report-credentials-file=/etc/report/credentials - --target=[images] - --target=[release:latest] - - --target=test-bin command: - ci-operator image: ci-operator:latest diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_11 b/core-services/image-mirroring/openshift/mapping_origin_4_11 index e4fdb8813c851..5385cd624e2b7 100644 --- a/core-services/image-mirroring/openshift/mapping_origin_4_11 +++ b/core-services/image-mirroring/openshift/mapping_origin_4_11 @@ -249,7 +249,6 @@ registry.ci.openshift.org/origin/4.11:sro-test-bin quay.io/openshift/origin-sro- registry.ci.openshift.org/origin/4.11:telemeter quay.io/openshift/origin-telemeter:4.11 quay.io/openshift/origin-telemeter:4.11.0 quay.io/openshift/origin-telemeter:latest registry.ci.openshift.org/origin/4.11:template-service-broker quay.io/openshift/origin-template-service-broker:4.11 quay.io/openshift/origin-template-service-broker:4.11.0 quay.io/openshift/origin-template-service-broker:latest registry.ci.openshift.org/origin/4.11:template-service-broker-operator quay.io/openshift/origin-template-service-broker-operator:4.11 quay.io/openshift/origin-template-service-broker-operator:4.11.0 quay.io/openshift/origin-template-service-broker-operator:latest -registry.ci.openshift.org/origin/4.11:test-bin quay.io/openshift/origin-test-bin:4.11 quay.io/openshift/origin-test-bin:4.11.0 quay.io/openshift/origin-test-bin:latest registry.ci.openshift.org/origin/4.11:test-build-roots2i quay.io/openshift/origin-test-build-roots2i:4.11 quay.io/openshift/origin-test-build-roots2i:4.11.0 quay.io/openshift/origin-test-build-roots2i:latest registry.ci.openshift.org/origin/4.11:test-build-simples2i quay.io/openshift/origin-test-build-simples2i:4.11 quay.io/openshift/origin-test-build-simples2i:4.11.0 quay.io/openshift/origin-test-build-simples2i:latest registry.ci.openshift.org/origin/4.11:tests quay.io/openshift/origin-tests:4.11 quay.io/openshift/origin-tests:4.11.0 quay.io/openshift/origin-tests:latest