diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-main__okd.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-main__okd.yaml deleted file mode 100644 index b424fb9bd706a..0000000000000 --- a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-main__okd.yaml +++ /dev/null @@ -1,38 +0,0 @@ -build_root: - from_repository: true -images: -- dockerfile_path: Dockerfile - to: cluster-update-keys -promotion: - to: - - name: "4.20" - namespace: origin -releases: - initial: - integration: - name: "4.20" - namespace: origin - latest: - integration: - include_built_images: true - name: "4.20" - namespace: origin -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -tests: -- as: e2e-aws - steps: - cluster_profile: aws-2 - workflow: openshift-e2e-aws -- as: e2e-aws-upgrade - steps: - cluster_profile: aws - workflow: openshift-upgrade-aws -zz_generated_metadata: - branch: main - org: openshift - repo: cluster-update-keys - variant: okd diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main__okd.yaml deleted file mode 100644 index e4f6f36a24193..0000000000000 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main__okd.yaml +++ /dev/null @@ -1,84 +0,0 @@ -base_images: - ocp_builder_rhel-8-golang-1.23-openshift-4.19: - name: builder - namespace: ocp - tag: rhel-8-golang-1.23-openshift-4.19 - ocp_builder_rhel-9-enterprise-base-multi-openshift-4.18: - name: builder - namespace: ocp - tag: rhel-9-enterprise-base-multi-openshift-4.18 - ocp_builder_rhel-9-golang-1.23-openshift-4.19: - name: builder - namespace: ocp - tag: rhel-9-golang-1.23-openshift-4.19 -build_root: - from_repository: true -images: -- build_args: - - name: TAGS - value: fcos - dockerfile_path: Dockerfile - inputs: - ocp_builder_rhel-8-golang-1.23-openshift-4.19: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19 - ocp_builder_rhel-9-enterprise-base-multi-openshift-4.18: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-enterprise-base-multi-openshift-4.18 - ocp_builder_rhel-9-golang-1.23-openshift-4.19: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 - to: machine-config-operator -promotion: - to: - - name: "4.20" - namespace: origin -releases: - initial: - integration: - name: "4.20" - namespace: origin - latest: - integration: - include_built_images: true - name: "4.20" - namespace: origin -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -tests: -- as: e2e-aws - optional: true - steps: - cluster_profile: aws - workflow: openshift-e2e-aws -- as: e2e-gcp-op - optional: true - steps: - cluster_profile: gcp - test: - - as: test - cli: latest - commands: make test-e2e - from: src - resources: - requests: - cpu: 100m - workflow: ipi-gcp -- as: e2e-upgrade - optional: true - steps: - cluster_profile: gcp - workflow: openshift-upgrade-gcp -- as: e2e-vsphere - optional: true - steps: - cluster_profile: vsphere-elastic - workflow: openshift-e2e-vsphere -zz_generated_metadata: - branch: main - org: openshift - repo: machine-config-operator - variant: okd diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml deleted file mode 100644 index 8e3ff0727b049..0000000000000 --- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml +++ /dev/null @@ -1,48 +0,0 @@ -base_images: - ocp_4.19_base-rhel9: - name: "4.20" - namespace: ocp - tag: base-rhel9 - ocp_4.19_installer: - name: "4.20" - namespace: ocp - tag: installer -build_root: - from_repository: true -images: -- build_args: - - name: DIRECT_DOWNLOAD - value: "true" - dockerfile_path: Dockerfile - inputs: - ocp_4.19_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.19:base-rhel9 - ocp_4.19_installer: - as: - - registry.ci.openshift.org/ocp/4.19:installer - to: machine-os-images -promotion: - to: - - name: "4.20" - namespace: origin -releases: - initial: - integration: - name: "4.20" - namespace: origin - latest: - integration: - include_built_images: true - name: "4.20" - namespace: origin -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: main - org: openshift - repo: machine-os-images - variant: okd diff --git a/ci-operator/config/openshift/origin/openshift-origin-main__okd.yaml b/ci-operator/config/openshift/origin/openshift-origin-main__okd.yaml deleted file mode 100644 index 388c70076f23b..0000000000000 --- a/ci-operator/config/openshift/origin/openshift-origin-main__okd.yaml +++ /dev/null @@ -1,37 +0,0 @@ -binary_build_commands: make build -build_root: - from_repository: true -releases: - initial: - integration: - name: "4.13" - namespace: origin - latest: - integration: - include_built_images: true - name: "4.13" - namespace: origin -resources: - '*': - requests: - cpu: 100m - memory: 4Gi - bin: - requests: - cpu: "3" - memory: 7Gi - verify: - requests: - cpu: "3" - memory: 8Gi -tests: -- as: e2e-gcp - optional: true - steps: - cluster_profile: gcp - workflow: openshift-e2e-gcp -zz_generated_metadata: - branch: main - org: openshift - repo: origin - variant: okd diff --git a/ci-operator/jobs/openshift/cluster-update-keys/openshift-cluster-update-keys-main-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-update-keys/openshift-cluster-update-keys-main-postsubmits.yaml index 195f5b61b2f5f..bb450b92e6648 100644 --- a/ci-operator/jobs/openshift/cluster-update-keys/openshift-cluster-update-keys-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-update-keys/openshift-cluster-update-keys-main-postsubmits.yaml @@ -58,66 +58,6 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^main$ - cluster: build05 - decorate: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-cluster-update-keys-main-okd-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=okd - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-update-keys/openshift-cluster-update-keys-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-update-keys/openshift-cluster-update-keys-main-presubmits.yaml index 71e2b58eca403..3f12c14bc0d61 100644 --- a/ci-operator/jobs/openshift/cluster-update-keys/openshift-cluster-update-keys-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-update-keys/openshift-cluster-update-keys-main-presubmits.yaml @@ -198,210 +198,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build05 - context: ci/prow/okd-e2e-aws - decorate: true - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-update-keys-main-okd-e2e-aws - rerun_command: /test okd-e2e-aws - 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 - - --target=e2e-aws - - --variant=okd - 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: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build05 - context: ci/prow/okd-e2e-aws-upgrade - decorate: true - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-update-keys-main-okd-e2e-aws-upgrade - rerun_command: /test okd-e2e-aws-upgrade - 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 - - --target=e2e-aws-upgrade - - --variant=okd - 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: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-aws-upgrade,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build05 - context: ci/prow/okd-images - decorate: true - labels: - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-update-keys-main-okd-images - rerun_command: /test okd-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --target=[release:latest] - - --variant=okd - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-images,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-postsubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-postsubmits.yaml index 3341ea8200d85..7cd84972a19ff 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-postsubmits.yaml @@ -58,66 +58,6 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^main$ - cluster: build07 - decorate: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-machine-config-operator-main-okd-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=okd - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml index 7e664cfa33e67..a22f751940742 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-main-presubmits.yaml @@ -3637,363 +3637,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/okd-e2e-aws - decorate: true - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-machine-config-operator-main-okd-e2e-aws - optional: true - rerun_command: /test okd-e2e-aws - 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 - - --target=e2e-aws - - --variant=okd - 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: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build02 - context: ci/prow/okd-e2e-gcp-op - decorate: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-machine-config-operator-main-okd-e2e-gcp-op - optional: true - rerun_command: /test okd-e2e-gcp-op - 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 - - --target=e2e-gcp-op - - --variant=okd - 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: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-gcp-op,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build02 - context: ci/prow/okd-e2e-upgrade - decorate: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-machine-config-operator-main-okd-e2e-upgrade - optional: true - rerun_command: /test okd-e2e-upgrade - 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 - - --target=e2e-upgrade - - --variant=okd - 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: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-upgrade,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: vsphere02 - context: ci/prow/okd-e2e-vsphere - decorate: true - labels: - ci-operator.openshift.io/cloud: vsphere - ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-machine-config-operator-main-okd-e2e-vsphere - optional: true - rerun_command: /test okd-e2e-vsphere - 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 - - --target=e2e-vsphere - - --variant=okd - 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: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-vsphere,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build10 - context: ci/prow/okd-images - decorate: true - labels: - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-machine-config-operator-main-okd-images - optional: true - rerun_command: /test okd-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --target=[release:latest] - - --variant=okd - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-images,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-main-postsubmits.yaml b/ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-main-postsubmits.yaml index 3ed8ffbe9522e..aacf4169da98f 100644 --- a/ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-main-postsubmits.yaml @@ -58,66 +58,6 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^main$ - cluster: build06 - decorate: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-machine-os-images-main-okd-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=okd - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-main-presubmits.yaml b/ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-main-presubmits.yaml index b5d61fdd93989..67744d6f21e7d 100644 --- a/ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-os-images/openshift-machine-os-images-main-presubmits.yaml @@ -204,62 +204,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build07 - context: ci/prow/okd-images - decorate: true - labels: - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-machine-os-images-main-okd-images - rerun_command: /test okd-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --target=[release:latest] - - --variant=okd - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-images,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml index c31f90abd083d..fdf557a907e51 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml @@ -5832,81 +5832,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )lint,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build02 - context: ci/prow/okd-e2e-gcp - decorate: true - labels: - ci-operator.openshift.io/cloud: gcp - ci-operator.openshift.io/cloud-cluster-profile: gcp - ci-operator.openshift.io/variant: okd - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-origin-main-okd-e2e-gcp - optional: true - rerun_command: /test okd-e2e-gcp - 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 - - --target=e2e-gcp - - --variant=okd - 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: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - 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: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )okd-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: false branches: