diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml index 333ef6ce46a8d..bbd49296a9a76 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master__okd.yaml @@ -32,9 +32,6 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 to: machine-config-operator -promotion: - name: "4.7" - namespace: origin resources: '*': requests: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6__okd.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6__okd.yaml index 5f4fdf90ebfef..232761ec7a60a 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6__okd.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6__okd.yaml @@ -36,9 +36,6 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 to: machine-config-operator -promotion: - name: "4.6" - namespace: origin resources: '*': requests: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml index 55efecbdd385a..cb7120bb6adec 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml @@ -54,59 +54,3 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator - - agent: kubernetes - branches: - - ^master$ - cluster: build02 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: okd - max_concurrency: 1 - name: branch-ci-openshift-machine-config-operator-master-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-password-file=/etc/report/password.txt - - --report-username=ci - - --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: /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: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-postsubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-postsubmits.yaml index 9535ff36a35aa..e01b34239b5ce 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-postsubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.6-postsubmits.yaml @@ -54,59 +54,3 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator - - agent: kubernetes - branches: - - ^release-4\.6$ - cluster: build02 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: okd - max_concurrency: 1 - name: branch-ci-openshift-machine-config-operator-release-4.6-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-password-file=/etc/report/password.txt - - --report-username=ci - - --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: /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: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator