diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml index 54852f654059c..6828aa0d10b02 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-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 base: name: "4.10" @@ -140,7 +144,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws optional: true diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml index c8850c3997df4..6da9b59ee5390 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-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 base: name: "4.11" @@ -139,7 +143,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws optional: true diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml index c5ca37e52e875..09d3d8a839313 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7.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 base: name: "4.7" @@ -129,7 +133,7 @@ tests: workflow: baremetalds-e2e-virtualmedia - as: e2e-metal-assisted steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws steps: diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml index 6b7b34781f572..be9bf50b1988e 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-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 base: name: "4.8" @@ -133,7 +137,7 @@ tests: workflow: baremetalds-e2e-virtualmedia - as: e2e-metal-assisted steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws steps: diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml index 2c1287c6482d8..ae3b086a555e8 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-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 base: name: "4.9" @@ -134,7 +138,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws optional: true diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10-presubmits.yaml index a1b9c7f28a70c..ee25b5932be6d 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.10-presubmits.yaml @@ -156,7 +156,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-baremetal-operator-release-4.10-e2e-metal-assisted @@ -211,7 +211,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-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11-presubmits.yaml index 50faf94216455..1ba8444269bb2 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.11-presubmits.yaml @@ -156,7 +156,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-baremetal-operator-release-4.11-e2e-metal-assisted @@ -211,7 +211,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-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7-presubmits.yaml index 6dbdfbfe370c3..93269fe83c688 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.7-presubmits.yaml @@ -160,7 +160,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-baremetal-operator-release-4.7-e2e-metal-assisted @@ -214,7 +214,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-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8-presubmits.yaml index 93d33d1f1b41a..28c0700fcea65 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.8-presubmits.yaml @@ -160,7 +160,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-baremetal-operator-release-4.8-e2e-metal-assisted @@ -214,7 +214,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-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml index 17677c264ed3e..7b1b57d5189b1 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-release-4.9-presubmits.yaml @@ -155,7 +155,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-baremetal-operator-release-4.9-e2e-metal-assisted @@ -210,7 +210,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