From 7eb36cd03e3ac772c77ba5a79d77c1740e4072cc Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Mon, 8 Aug 2022 13:28:05 +0200 Subject: [PATCH 1/2] Remove openstack ccm jobs As external cloud provider is now the default provider used for the OCP cluster running on OpenStack, there is no need to have jobs enabling it as tech preview on master and later releases. --- ...shift-cloud-provider-openstack-master.yaml | 24 - ...cloud-provider-openstack-release-4.12.yaml | 24 - ...cloud-provider-openstack-release-4.13.yaml | 24 - ...ud-controller-manager-operator-master.yaml | 4 +- ...troller-manager-operator-release-4.12.yaml | 4 +- ...troller-manager-operator-release-4.13.yaml | 4 +- ...ack-shiftstack-ci-main__periodic-4.11.yaml | 25 - ...ack-shiftstack-ci-main__periodic-4.12.yaml | 25 - ...-provider-openstack-master-presubmits.yaml | 148 ------ ...der-openstack-release-4.12-presubmits.yaml | 148 ------ ...der-openstack-release-4.13-presubmits.yaml | 148 ------ ...er-manager-operator-master-presubmits.yaml | 14 +- ...ager-operator-release-4.12-presubmits.yaml | 14 +- ...ager-operator-release-4.13-presubmits.yaml | 14 +- ...iftstack-shiftstack-ci-main-periodics.yaml | 490 ------------------ 15 files changed, 27 insertions(+), 1083 deletions(-) diff --git a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml index f5abb6ea88798..98a1952cf4c64 100644 --- a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml +++ b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master.yaml @@ -83,30 +83,6 @@ tests: steps: cluster_profile: openstack-vh-mecha-central workflow: openshift-e2e-openstack-csi-manila -- as: e2e-openstack-ccm - optional: true - steps: - cluster_profile: openstack-vexxhost - env: - BASE_DOMAIN: shiftstack.devcluster.openshift.com - CONFIG_TYPE: minimal - TEST_SKIPS: Managed cluster should start all core operators\| Alerts shouldn't - report any unexpected alerts in firing or pending state\| Prometheus when - installed on the cluster shouldn't report any alerts in firing state apart - from Watchdog and AlertmanagerReceiversNotConfigured - workflow: openshift-e2e-openstack-ccm -- as: e2e-openstack-ccm-install - optional: true - steps: - cluster_profile: openstack-vexxhost - env: - BASE_DOMAIN: shiftstack.devcluster.openshift.com - CONFIG_TYPE: minimal - TEST_SKIPS: Managed cluster should start all core operators\| Alerts shouldn't - report any unexpected alerts in firing or pending state\| Prometheus when - installed on the cluster shouldn't report any alerts in firing state apart - from Watchdog and AlertmanagerReceiversNotConfigured - workflow: openshift-e2e-openstack-techpreview zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.12.yaml b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.12.yaml index d9137dc0d4363..5797e2261b69a 100644 --- a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.12.yaml +++ b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.12.yaml @@ -84,30 +84,6 @@ tests: steps: cluster_profile: openstack-vh-mecha-central workflow: openshift-e2e-openstack-csi-manila -- as: e2e-openstack-ccm - optional: true - steps: - cluster_profile: openstack-vexxhost - env: - BASE_DOMAIN: shiftstack.devcluster.openshift.com - CONFIG_TYPE: minimal - TEST_SKIPS: Managed cluster should start all core operators\| Alerts shouldn't - report any unexpected alerts in firing or pending state\| Prometheus when - installed on the cluster shouldn't report any alerts in firing state apart - from Watchdog and AlertmanagerReceiversNotConfigured - workflow: openshift-e2e-openstack-ccm -- as: e2e-openstack-ccm-install - optional: true - steps: - cluster_profile: openstack-vexxhost - env: - BASE_DOMAIN: shiftstack.devcluster.openshift.com - CONFIG_TYPE: minimal - TEST_SKIPS: Managed cluster should start all core operators\| Alerts shouldn't - report any unexpected alerts in firing or pending state\| Prometheus when - installed on the cluster shouldn't report any alerts in firing state apart - from Watchdog and AlertmanagerReceiversNotConfigured - workflow: openshift-e2e-openstack-techpreview zz_generated_metadata: branch: release-4.12 org: openshift diff --git a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.13.yaml b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.13.yaml index 5199231a9d27c..f3af637b55167 100644 --- a/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.13.yaml +++ b/ci-operator/config/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.13.yaml @@ -83,30 +83,6 @@ tests: steps: cluster_profile: openstack-vh-mecha-central workflow: openshift-e2e-openstack-csi-manila -- as: e2e-openstack-ccm - optional: true - steps: - cluster_profile: openstack-vexxhost - env: - BASE_DOMAIN: shiftstack.devcluster.openshift.com - CONFIG_TYPE: minimal - TEST_SKIPS: Managed cluster should start all core operators\| Alerts shouldn't - report any unexpected alerts in firing or pending state\| Prometheus when - installed on the cluster shouldn't report any alerts in firing state apart - from Watchdog and AlertmanagerReceiversNotConfigured - workflow: openshift-e2e-openstack-ccm -- as: e2e-openstack-ccm-install - optional: true - steps: - cluster_profile: openstack-vexxhost - env: - BASE_DOMAIN: shiftstack.devcluster.openshift.com - CONFIG_TYPE: minimal - TEST_SKIPS: Managed cluster should start all core operators\| Alerts shouldn't - report any unexpected alerts in firing or pending state\| Prometheus when - installed on the cluster shouldn't report any alerts in firing state apart - from Watchdog and AlertmanagerReceiversNotConfigured - workflow: openshift-e2e-openstack-techpreview zz_generated_metadata: branch: release-4.13 org: openshift diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml index 51ad4f7d0e64a..1cbb9fb0b5ac1 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml @@ -114,7 +114,7 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp-ccm-install -- as: e2e-openstack-ccm +- as: e2e-openstack optional: true steps: cluster_profile: openstack-vh-mecha-central @@ -122,7 +122,7 @@ tests: BASE_DOMAIN: shiftstack.devcluster.openshift.com CONFIG_TYPE: minimal TEST_SUITE: experimental/reliability/minimal - workflow: openshift-e2e-openstack-ccm + workflow: openshift-e2e-openstack-ipi - as: e2e-vsphere-ccm optional: true skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml index b9b3f6bb9d1b5..2bccbb8c78733 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml @@ -115,7 +115,7 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp-ccm-install -- as: e2e-openstack-ccm +- as: e2e-openstack optional: true steps: cluster_profile: openstack-vh-mecha-central @@ -123,7 +123,7 @@ tests: BASE_DOMAIN: shiftstack.devcluster.openshift.com CONFIG_TYPE: minimal TEST_SUITE: experimental/reliability/minimal - workflow: openshift-e2e-openstack-ccm + workflow: openshift-e2e-openstack-ipi - as: e2e-vsphere-ccm optional: true skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml index a99f56ee38465..32ee660134c15 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml @@ -114,7 +114,7 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp-ccm-install -- as: e2e-openstack-ccm +- as: e2e-openstack optional: true steps: cluster_profile: openstack-vh-mecha-central @@ -122,7 +122,7 @@ tests: BASE_DOMAIN: shiftstack.devcluster.openshift.com CONFIG_TYPE: minimal TEST_SUITE: experimental/reliability/minimal - workflow: openshift-e2e-openstack-ccm + workflow: openshift-e2e-openstack-ipi - as: e2e-vsphere-ccm optional: true skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ diff --git a/ci-operator/config/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main__periodic-4.11.yaml b/ci-operator/config/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main__periodic-4.11.yaml index 4c2c941927b65..2574081e52bd0 100644 --- a/ci-operator/config/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main__periodic-4.11.yaml +++ b/ci-operator/config/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main__periodic-4.11.yaml @@ -97,13 +97,6 @@ tests: env: TEST_SUITE: openshift/conformance/parallel workflow: openshift-e2e-openstack-ipi -- as: e2e-openstack-techpreview-parallel - interval: 72h - steps: - cluster_profile: openstack-vexxhost - env: - TEST_SUITE: openshift/conformance/parallel - workflow: openshift-e2e-openstack-techpreview - as: e2e-openstack-serial interval: 72h steps: @@ -111,13 +104,6 @@ tests: env: TEST_SUITE: openshift/conformance/serial workflow: openshift-e2e-openstack-ipi -- as: e2e-openstack-techpreview-serial - interval: 72h - steps: - cluster_profile: openstack-vexxhost - env: - TEST_SUITE: openshift/conformance/serial - workflow: openshift-e2e-openstack-techpreview - as: e2e-openstack-ovn interval: 72h steps: @@ -136,17 +122,6 @@ tests: should serve a basic endpoint from pods TEST_SUITE: kubernetes/conformance workflow: openshift-e2e-openstack-ipi -- as: e2e-openstack-ccm-install - interval: 72h - steps: - cluster_profile: openstack-vexxhost - env: - CONFIG_TYPE: minimal - TEST_SKIPS: Managed cluster should start all core operators\| Alerts shouldn't - report any unexpected alerts in firing or pending state\| Prometheus when - installed on the cluster shouldn't report any alerts in firing state apart - from Watchdog and AlertmanagerReceiversNotConfigured - workflow: openshift-e2e-openstack-techpreview - as: e2e-openstack-nfv-hwoffload interval: 72h steps: diff --git a/ci-operator/config/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main__periodic-4.12.yaml b/ci-operator/config/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main__periodic-4.12.yaml index d2633b282b103..b296a6636a024 100644 --- a/ci-operator/config/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main__periodic-4.12.yaml +++ b/ci-operator/config/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main__periodic-4.12.yaml @@ -97,13 +97,6 @@ tests: env: TEST_SUITE: openshift/conformance/parallel workflow: openshift-e2e-openstack-ipi -- as: e2e-openstack-techpreview-parallel - interval: 24h - steps: - cluster_profile: openstack-vexxhost - env: - TEST_SUITE: openshift/conformance/parallel - workflow: openshift-e2e-openstack-techpreview - as: e2e-openstack-serial interval: 24h steps: @@ -111,13 +104,6 @@ tests: env: TEST_SUITE: openshift/conformance/serial workflow: openshift-e2e-openstack-ipi -- as: e2e-openstack-techpreview-serial - interval: 24h - steps: - cluster_profile: openstack-vexxhost - env: - TEST_SUITE: openshift/conformance/serial - workflow: openshift-e2e-openstack-techpreview - as: e2e-openstack-ovn interval: 24h steps: @@ -136,17 +122,6 @@ tests: should serve a basic endpoint from pods TEST_SUITE: kubernetes/conformance workflow: openshift-e2e-openstack-ipi -- as: e2e-openstack-ccm-install - interval: 24h - steps: - cluster_profile: openstack-vexxhost - env: - CONFIG_TYPE: minimal - TEST_SKIPS: Managed cluster should start all core operators\| Alerts shouldn't - report any unexpected alerts in firing or pending state\| Prometheus when - installed on the cluster shouldn't report any alerts in firing state apart - from Watchdog and AlertmanagerReceiversNotConfigured - workflow: openshift-e2e-openstack-techpreview - as: e2e-openstack-nfv-hwoffload interval: 48h steps: diff --git a/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master-presubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master-presubmits.yaml index abe8e23f0fdd5..5bf5015c0ed1a 100644 --- a/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-master-presubmits.yaml @@ -73,154 +73,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/e2e-openstack-ccm - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cloud-provider-openstack-master-e2e-openstack-ccm - optional: true - path_alias: k8s.io/cloud-provider-openstack - rerun_command: /test e2e-openstack-ccm - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-cluster-profile - - --target=e2e-openstack-ccm - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/e2e-openstack-ccm-install - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cloud-provider-openstack-master-e2e-openstack-ccm-install - optional: true - path_alias: k8s.io/cloud-provider-openstack - rerun_command: /test e2e-openstack-ccm-install - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-install-cluster-profile - - --target=e2e-openstack-ccm-install - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-install-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.12-presubmits.yaml index 18acd08c1ea98..969d0a224bbb0 100644 --- a/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.12-presubmits.yaml @@ -73,154 +73,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.12$ - - ^release-4\.12- - cluster: build02 - context: ci/prow/e2e-openstack-ccm - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cloud-provider-openstack-release-4.12-e2e-openstack-ccm - optional: true - path_alias: k8s.io/cloud-provider-openstack - rerun_command: /test e2e-openstack-ccm - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-cluster-profile - - --target=e2e-openstack-ccm - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.12$ - - ^release-4\.12- - cluster: build02 - context: ci/prow/e2e-openstack-ccm-install - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cloud-provider-openstack-release-4.12-e2e-openstack-ccm-install - optional: true - path_alias: k8s.io/cloud-provider-openstack - rerun_command: /test e2e-openstack-ccm-install - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-install-cluster-profile - - --target=e2e-openstack-ccm-install - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-install-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.13-presubmits.yaml index cbac73262bf5a..250f55dbbbeec 100644 --- a/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift/cloud-provider-openstack/openshift-cloud-provider-openstack-release-4.13-presubmits.yaml @@ -73,154 +73,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.13$ - - ^release-4\.13- - cluster: build01 - context: ci/prow/e2e-openstack-ccm - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cloud-provider-openstack-release-4.13-e2e-openstack-ccm - optional: true - path_alias: k8s.io/cloud-provider-openstack - rerun_command: /test e2e-openstack-ccm - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-cluster-profile - - --target=e2e-openstack-ccm - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.13$ - - ^release-4\.13- - cluster: build01 - context: ci/prow/e2e-openstack-ccm-install - decorate: true - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cloud-provider-openstack-release-4.13-e2e-openstack-ccm-install - optional: true - path_alias: k8s.io/cloud-provider-openstack - rerun_command: /test e2e-openstack-ccm-install - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-install-cluster-profile - - --target=e2e-openstack-ccm-install - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-install-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master-presubmits.yaml index 848cffb256e6a..78b3c58adaa8c 100644 --- a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master-presubmits.yaml @@ -747,16 +747,16 @@ presubmits: - ^master$ - ^master- cluster: build02 - context: ci/prow/e2e-openstack-ccm + context: ci/prow/e2e-openstack decorate: true labels: ci-operator.openshift.io/cloud: openstack-vh-mecha-central ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-openstack-ccm + name: pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-openstack optional: true - rerun_command: /test e2e-openstack-ccm + rerun_command: /test e2e-openstack spec: containers: - args: @@ -765,8 +765,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-cluster-profile - - --target=e2e-openstack-ccm + - --secret-dir=/usr/local/e2e-openstack-cluster-profile + - --target=e2e-openstack command: - ci-operator image: ci-operator:latest @@ -782,7 +782,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-cluster-profile + - mountPath: /usr/local/e2e-openstack-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -813,7 +813,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12-presubmits.yaml index 854639fa56806..07945696a8067 100644 --- a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12-presubmits.yaml @@ -747,16 +747,16 @@ presubmits: - ^release-4\.12$ - ^release-4\.12- cluster: build02 - context: ci/prow/e2e-openstack-ccm + context: ci/prow/e2e-openstack decorate: true labels: ci-operator.openshift.io/cloud: openstack-vh-mecha-central ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-cloud-controller-manager-operator-release-4.12-e2e-openstack-ccm + name: pull-ci-openshift-cluster-cloud-controller-manager-operator-release-4.12-e2e-openstack optional: true - rerun_command: /test e2e-openstack-ccm + rerun_command: /test e2e-openstack spec: containers: - args: @@ -765,8 +765,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-cluster-profile - - --target=e2e-openstack-ccm + - --secret-dir=/usr/local/e2e-openstack-cluster-profile + - --target=e2e-openstack command: - ci-operator image: ci-operator:latest @@ -782,7 +782,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-cluster-profile + - mountPath: /usr/local/e2e-openstack-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -813,7 +813,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13-presubmits.yaml index 6e37ce0e9d32c..0b95e483a3601 100644 --- a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13-presubmits.yaml @@ -747,16 +747,16 @@ presubmits: - ^release-4\.13$ - ^release-4\.13- cluster: build01 - context: ci/prow/e2e-openstack-ccm + context: ci/prow/e2e-openstack decorate: true labels: ci-operator.openshift.io/cloud: openstack-vh-mecha-central ci-operator.openshift.io/cloud-cluster-profile: openstack-vh-mecha-central ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-cloud-controller-manager-operator-release-4.13-e2e-openstack-ccm + name: pull-ci-openshift-cluster-cloud-controller-manager-operator-release-4.13-e2e-openstack optional: true - rerun_command: /test e2e-openstack-ccm + rerun_command: /test e2e-openstack spec: containers: - args: @@ -765,8 +765,8 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-cluster-profile - - --target=e2e-openstack-ccm + - --secret-dir=/usr/local/e2e-openstack-cluster-profile + - --target=e2e-openstack command: - ci-operator image: ci-operator:latest @@ -782,7 +782,7 @@ presubmits: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-cluster-profile + - mountPath: /usr/local/e2e-openstack-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -813,7 +813,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-openstack-ccm,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main-periodics.yaml b/ci-operator/jobs/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main-periodics.yaml index de1ca3bd40ebb..a79c81962187a 100644 --- a/ci-operator/jobs/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main-periodics.yaml +++ b/ci-operator/jobs/shiftstack/shiftstack-ci/shiftstack-shiftstack-ci-main-periodics.yaml @@ -1913,81 +1913,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: shiftstack - repo: shiftstack-ci - interval: 72h - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci-operator.openshift.io/variant: periodic-4.11 - ci.openshift.io/generator: prowgen - job-release: "4.11" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-shiftstack-shiftstack-ci-main-periodic-4.11-e2e-openstack-ccm-install - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-install-cluster-profile - - --target=e2e-openstack-ccm-install - - --variant=periodic-4.11 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-install-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true @@ -2984,172 +2909,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: shiftstack - repo: shiftstack-ci - interval: 72h - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci-operator.openshift.io/variant: periodic-4.11 - ci.openshift.io/generator: prowgen - job-release: "4.11" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-shiftstack-shiftstack-ci-main-periodic-4.11-e2e-openstack-techpreview-parallel - reporter_config: - slack: - channel: '#shiftstack-bot' - job_states_to_report: - - failure - - error - report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs> :volcano:' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-techpreview-parallel-cluster-profile - - --target=e2e-openstack-techpreview-parallel - - --variant=periodic-4.11 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-techpreview-parallel-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: shiftstack - repo: shiftstack-ci - interval: 72h - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci-operator.openshift.io/variant: periodic-4.11 - ci.openshift.io/generator: prowgen - job-release: "4.11" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-shiftstack-shiftstack-ci-main-periodic-4.11-e2e-openstack-techpreview-serial - reporter_config: - slack: - channel: '#shiftstack-bot' - job_states_to_report: - - failure - - error - report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs> :volcano:' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-techpreview-serial-cluster-profile - - --target=e2e-openstack-techpreview-serial - - --variant=periodic-4.11 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-techpreview-serial-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true @@ -3399,89 +3158,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: shiftstack - repo: shiftstack-ci - interval: 24h - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci-operator.openshift.io/variant: periodic-4.12 - ci.openshift.io/generator: prowgen - job-release: "4.12" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-shiftstack-shiftstack-ci-main-periodic-4.12-e2e-openstack-ccm-install - reporter_config: - slack: - channel: '#shiftstack-bot' - job_states_to_report: - - failure - - error - report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs> :volcano:' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-ccm-install-cluster-profile - - --target=e2e-openstack-ccm-install - - --variant=periodic-4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-ccm-install-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true @@ -4478,172 +4154,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: shiftstack - repo: shiftstack-ci - interval: 24h - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci-operator.openshift.io/variant: periodic-4.12 - ci.openshift.io/generator: prowgen - job-release: "4.12" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-shiftstack-shiftstack-ci-main-periodic-4.12-e2e-openstack-techpreview-parallel - reporter_config: - slack: - channel: '#shiftstack-bot' - job_states_to_report: - - failure - - error - report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs> :volcano:' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-techpreview-parallel-cluster-profile - - --target=e2e-openstack-techpreview-parallel - - --variant=periodic-4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-techpreview-parallel-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: shiftstack - repo: shiftstack-ci - interval: 24h - labels: - ci-operator.openshift.io/cloud: openstack-vexxhost - ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost - ci-operator.openshift.io/variant: periodic-4.12 - ci.openshift.io/generator: prowgen - job-release: "4.12" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-shiftstack-shiftstack-ci-main-periodic-4.12-e2e-openstack-techpreview-serial - reporter_config: - slack: - channel: '#shiftstack-bot' - job_states_to_report: - - failure - - error - report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs> :volcano:' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-openstack-techpreview-serial-cluster-profile - - --target=e2e-openstack-techpreview-serial - - --variant=periodic-4.12 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/e2e-openstack-techpreview-serial-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-openstack-vexxhost - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true From 66870d2b6257e1209270454968be9922b9048054 Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Wed, 17 Aug 2022 13:07:31 +0200 Subject: [PATCH 2/2] Increase test suite for CCCMO jobs with OpenStack As CCM is the default for OpenStack, the test suite that runs on the CCCMO jobs are now updated to run default tests, which contains the e2e conformance parallel and openstack tests. --- ...enshift-cluster-cloud-controller-manager-operator-master.yaml | 1 - ...t-cluster-cloud-controller-manager-operator-release-4.12.yaml | 1 - ...t-cluster-cloud-controller-manager-operator-release-4.13.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml index 1cbb9fb0b5ac1..e95085558f9c2 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-master.yaml @@ -121,7 +121,6 @@ tests: env: BASE_DOMAIN: shiftstack.devcluster.openshift.com CONFIG_TYPE: minimal - TEST_SUITE: experimental/reliability/minimal workflow: openshift-e2e-openstack-ipi - as: e2e-vsphere-ccm optional: true diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml index 2bccbb8c78733..c05b925638430 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.12.yaml @@ -122,7 +122,6 @@ tests: env: BASE_DOMAIN: shiftstack.devcluster.openshift.com CONFIG_TYPE: minimal - TEST_SUITE: experimental/reliability/minimal workflow: openshift-e2e-openstack-ipi - as: e2e-vsphere-ccm optional: true diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml index 32ee660134c15..19e37b853c316 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-release-4.13.yaml @@ -121,7 +121,6 @@ tests: env: BASE_DOMAIN: shiftstack.devcluster.openshift.com CONFIG_TYPE: minimal - TEST_SUITE: experimental/reliability/minimal workflow: openshift-e2e-openstack-ipi - as: e2e-vsphere-ccm optional: true