diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml index baf25e66ba93b..6989eca4c6174 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.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 base: name: "4.10" @@ -154,7 +174,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws-single-node steps: @@ -163,7 +183,7 @@ tests: - as: e2e-metal-single-node-live-iso optional: true steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: configmap-scale steps: diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10.yaml index 7e9929261d0a6..512c657705f09 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10.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 base: name: "4.10" @@ -155,7 +175,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws-single-node steps: @@ -164,7 +184,7 @@ tests: - as: e2e-metal-single-node-live-iso optional: true steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: configmap-scale steps: diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11.yaml index 68e9231555061..0079c0716bb3d 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11.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 base: name: "4.11" @@ -154,7 +174,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws-single-node steps: @@ -163,7 +183,7 @@ tests: - as: e2e-metal-single-node-live-iso optional: true steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: configmap-scale steps: diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml index 028c0b07aebcb..f57f4850bf3cc 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml @@ -1,4 +1,28 @@ 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: ocm-2.5 + namespace: edge-infrastructure + tag: assisted-test-infra base: name: "4.6" namespace: ocp @@ -109,7 +133,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: configmap-scale steps: diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml index bfddcc7ff31f9..55906c8022d54 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-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 base: name: "4.7" @@ -118,7 +138,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: configmap-scale steps: diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8.yaml index 38d2a5d8b0339..0f1b879e1f06e 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8.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 base: name: "4.8" @@ -136,7 +156,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws-single-node steps: @@ -144,7 +164,7 @@ tests: workflow: openshift-e2e-aws-single-node - as: e2e-metal-single-node-live-iso steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: configmap-scale steps: diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9.yaml index 310d41e6083a4..c4400d71f1d7b 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9.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 base: name: "4.9" @@ -136,7 +156,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-aws-single-node optional: true @@ -146,7 +166,7 @@ tests: - as: e2e-metal-single-node-live-iso optional: true steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: configmap-scale steps: diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master-presubmits.yaml index 43a65e3b8429b..299b371570289 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master-presubmits.yaml @@ -1056,7 +1056,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-etcd-operator-master-e2e-metal-assisted @@ -1111,7 +1111,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 @@ -1348,7 +1348,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-sno ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-etcd-operator-master-e2e-metal-single-node-live-iso @@ -1403,7 +1403,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-sno - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10-presubmits.yaml index 889db4e738a48..097e839f11339 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.10-presubmits.yaml @@ -1056,7 +1056,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-etcd-operator-release-4.10-e2e-metal-assisted @@ -1111,7 +1111,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 @@ -1348,7 +1348,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-sno ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-etcd-operator-release-4.10-e2e-metal-single-node-live-iso @@ -1403,7 +1403,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-sno - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11-presubmits.yaml index 286b0faccde7a..3e450f44062f1 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.11-presubmits.yaml @@ -1056,7 +1056,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-etcd-operator-release-4.11-e2e-metal-assisted @@ -1111,7 +1111,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 @@ -1348,7 +1348,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-sno ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-etcd-operator-release-4.11-e2e-metal-single-node-live-iso @@ -1403,7 +1403,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-sno - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6-presubmits.yaml index dc0bf85e0f36f..844ce76c8c23a 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6-presubmits.yaml @@ -546,7 +546,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-etcd-operator-release-4.6-e2e-metal-assisted @@ -601,7 +601,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-etcd-operator/openshift-cluster-etcd-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7-presubmits.yaml index c8415aa94db6a..200c32bc84816 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7-presubmits.yaml @@ -613,7 +613,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-etcd-operator-release-4.7-e2e-metal-assisted @@ -668,7 +668,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-etcd-operator/openshift-cluster-etcd-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8-presubmits.yaml index be4c83d922ecc..9f5b41474dd6a 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.8-presubmits.yaml @@ -1056,7 +1056,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-etcd-operator-release-4.8-e2e-metal-assisted @@ -1111,7 +1111,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 @@ -1202,7 +1202,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-sno ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-etcd-operator-release-4.8-e2e-metal-single-node-live-iso @@ -1256,7 +1256,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-sno - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9-presubmits.yaml index 7564223047cb9..08f43c6954fae 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.9-presubmits.yaml @@ -1057,7 +1057,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-etcd-operator-release-4.9-e2e-metal-assisted @@ -1112,7 +1112,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 @@ -1203,7 +1203,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-sno ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-etcd-operator-release-4.9-e2e-metal-single-node-live-iso @@ -1258,7 +1258,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-packet + secretName: cluster-secrets-packet-sno - name: pull-secret secret: secretName: registry-pull-credentials