diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml index 640e4917e9589..33c2985f770e7 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml @@ -1,23 +1,27 @@ base_images: + assisted-image-service: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-image-service assisted-installer: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer assisted-installer-agent: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-agent assisted-installer-controller: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-controller assisted-service: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-service assisted-test-infra: - name: assisted-test - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-test-infra dev-scripts: name: test @@ -105,7 +109,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted zz_generated_metadata: branch: master diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.10.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.10.yaml index 39a419a038c2a..f633224741634 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.10.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.10.yaml @@ -1,23 +1,27 @@ base_images: + assisted-image-service: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-image-service assisted-installer: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer assisted-installer-agent: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-agent assisted-installer-controller: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-controller assisted-service: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-service assisted-test-infra: - name: assisted-test - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-test-infra dev-scripts: name: test @@ -106,7 +110,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted zz_generated_metadata: branch: release-4.10 diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.11.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.11.yaml index c4cdcc4c17ad8..04c5e7140e51d 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.11.yaml @@ -1,23 +1,27 @@ base_images: + assisted-image-service: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-image-service assisted-installer: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer assisted-installer-agent: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-agent assisted-installer-controller: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-controller assisted-service: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-service assisted-test-infra: - name: assisted-test - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-test-infra dev-scripts: name: test @@ -105,7 +109,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted zz_generated_metadata: branch: release-4.11 diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml index 7cc1ed404c26c..b5884177a628f 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml @@ -1,7 +1,27 @@ base_images: + assisted-image-service: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-image-service + assisted-installer: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-installer + assisted-installer-agent: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-installer-agent + assisted-installer-controller: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-installer-controller + assisted-service: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-service assisted-test-infra: - name: assisted-test - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-test-infra dev-scripts: name: test @@ -84,7 +104,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted zz_generated_metadata: branch: release-4.7 diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8.yaml index e5f576f356035..3e138573bd46e 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8.yaml @@ -1,23 +1,27 @@ base_images: + assisted-image-service: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-image-service assisted-installer: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer assisted-installer-agent: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-agent assisted-installer-controller: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-controller assisted-service: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-service assisted-test-infra: - name: assisted-test - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-test-infra dev-scripts: name: test @@ -100,7 +104,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted zz_generated_metadata: branch: release-4.8 diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9.yaml index 1fb5bff3b5873..2612fddcf14a7 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9.yaml @@ -1,23 +1,27 @@ base_images: + assisted-image-service: + name: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-image-service assisted-installer: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer assisted-installer-agent: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-agent assisted-installer-controller: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-installer-controller assisted-service: - name: assisted - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-service assisted-test-infra: - name: assisted-test - namespace: ocp-kni + name: ocm-2.5 + namespace: edge-infrastructure tag: assisted-test-infra dev-scripts: name: test @@ -105,7 +109,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted zz_generated_metadata: branch: release-4.9 diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml index 45880df4ef88a..a5a3ca1b415dd 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml @@ -229,7 +229,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-version-operator-master-e2e-metal-assisted @@ -284,7 +284,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.10-presubmits.yaml index a4671c07e6d65..ec6897ebaa5cb 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.10-presubmits.yaml @@ -229,7 +229,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-version-operator-release-4.10-e2e-metal-assisted @@ -284,7 +284,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.11-presubmits.yaml index 7e068f06b1cbe..ae3a9a42a04bc 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.11-presubmits.yaml @@ -229,7 +229,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-version-operator-release-4.11-e2e-metal-assisted @@ -284,7 +284,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml index 613c6a1608302..29a7963bc3ffc 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml @@ -234,7 +234,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-version-operator-release-4.7-e2e-metal-assisted @@ -289,7 +289,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml index c51fe3f639ac4..d9a4240484853 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml @@ -234,7 +234,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-version-operator-release-4.8-e2e-metal-assisted @@ -289,7 +289,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml index 9ede0fc36a356..1dff8d2c016f2 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml @@ -229,7 +229,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: packet - ci-operator.openshift.io/cloud-cluster-profile: packet + ci-operator.openshift.io/cloud-cluster-profile: packet-assisted ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-version-operator-release-4.9-e2e-metal-assisted @@ -284,7 +284,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-assisted - name: pull-secret secret: secretName: registry-pull-credentials