diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index 88936fd489317..69fd67fbbb055 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -1,4 +1,8 @@ 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 @@ -16,8 +20,8 @@ base_images: 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" @@ -404,7 +408,7 @@ tests: optional: true skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|images)/(aws|azure|gcp|libvirt|openstack|ovirt|vsphere)/) steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: e2e-aws-fips optional: true diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml index 268c6e8317ca9..35cabe3561dfb 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.10.yaml @@ -1,4 +1,8 @@ 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 @@ -16,8 +20,8 @@ base_images: 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" @@ -405,7 +409,7 @@ tests: optional: true skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|images)/(aws|azure|gcp|libvirt|openstack|ovirt|vsphere)/) steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: e2e-aws-fips optional: true diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml index 427df1837f1f1..97f40b4a00baa 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.11.yaml @@ -1,4 +1,8 @@ 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 @@ -16,8 +20,8 @@ base_images: 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" @@ -404,7 +408,7 @@ tests: optional: true skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)|(^(data/.*|pkg/.*|images)/(aws|azure|gcp|libvirt|openstack|ovirt|vsphere)/) steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: e2e-aws-fips optional: true diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.7.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.7.yaml index d835222222a32..78a55fec9c0ac 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.7.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-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" @@ -325,7 +345,7 @@ tests: workflow: openshift-e2e-gcp-libvirt - as: e2e-metal-assisted steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-ovirt optional: true diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.8.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.8.yaml index 5bfca1455076b..139b7d44a5cc7 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.8.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-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" @@ -346,7 +366,7 @@ tests: workflow: openshift-e2e-gcp-libvirt - as: e2e-metal-assisted steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-ovirt optional: true @@ -361,7 +381,7 @@ tests: - as: e2e-metal-single-node-live-iso skip_if_only_changed: ^docs/ steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: e2e-aws-fips optional: true diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.9.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.9.yaml index f1838942101c7..56ae71e9cc070 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.9.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-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" @@ -359,7 +379,7 @@ tests: - as: e2e-metal-assisted optional: true steps: - cluster_profile: packet + cluster_profile: packet-assisted workflow: baremetalds-assisted - as: e2e-ovirt optional: true @@ -376,7 +396,7 @@ tests: optional: true skip_if_only_changed: ^docs/ steps: - cluster_profile: packet + cluster_profile: packet-sno workflow: baremetalds-sno - as: e2e-aws-fips optional: true diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index 7d96bd0f6d8ee..da2ac1d44a1ed 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -2502,7 +2502,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-installer-master-e2e-metal-single-node-live-iso @@ -2558,7 +2558,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/installer/openshift-installer-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.10-presubmits.yaml index 2f7ab142f1e98..fe6d4956b4283 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.10-presubmits.yaml @@ -2502,7 +2502,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-installer-release-4.10-e2e-metal-single-node-live-iso @@ -2558,7 +2558,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/installer/openshift-installer-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.11-presubmits.yaml index d36c39c3e47c0..aff1c90eb7056 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.11-presubmits.yaml @@ -2501,7 +2501,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-installer-release-4.11-e2e-metal-single-node-live-iso @@ -2557,7 +2557,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/installer/openshift-installer-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.7-presubmits.yaml index acc6207a50763..9493a69528735 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.7-presubmits.yaml @@ -1588,7 +1588,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-installer-release-4.7-e2e-metal-assisted @@ -1642,7 +1642,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/installer/openshift-installer-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.8-presubmits.yaml index 2eb782bfb8154..fcbf2cc531a45 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.8-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.8-presubmits.yaml @@ -1736,7 +1736,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-installer-release-4.8-e2e-metal-assisted @@ -1790,7 +1790,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 @@ -2107,7 +2107,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-sno ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-installer-release-4.8-e2e-metal-single-node-live-iso @@ -2162,7 +2162,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/installer/openshift-installer-release-4.9-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.9-presubmits.yaml index 59d048544b433..30fde0a5debaf 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.9-presubmits.yaml @@ -1770,7 +1770,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-installer-release-4.9-e2e-metal-assisted @@ -1825,7 +1825,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 @@ -2208,7 +2208,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-installer-release-4.9-e2e-metal-single-node-live-iso @@ -2264,7 +2264,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