From 1d5d2cf978658bc71b087538b37b23480f4a38ae Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 13 May 2020 00:01:17 +0000 Subject: [PATCH 1/3] config-brancher --current-release 4.5 --future-release 4.6 --- .../config/openshift/origin/openshift-origin-release-4.6.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml index e3057d108f00..470836496b41 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml @@ -194,10 +194,6 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: gcp -- as: e2e-aws - steps: - cluster_profile: aws - workflow: origin-e2e-aws-loki - as: e2e-aws-ovn steps: cluster_profile: aws From 996d390faf72a09c3ff91dc4cce4db7aed824722 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 13 May 2020 00:01:19 +0000 Subject: [PATCH 2/3] ci-operator-config-mirror --config-path ./ci-operator/config --to-org openshift-priv --- .../openshift-priv/origin/openshift-priv-origin-master.yaml | 4 ---- .../origin/openshift-priv-origin-release-4.6.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml index d537cb4aaf66..d66aef40212b 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-master.yaml @@ -195,10 +195,6 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: gcp -- as: e2e-aws - steps: - cluster_profile: aws - workflow: origin-e2e-aws-loki - as: e2e-aws-ovn steps: cluster_profile: aws diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.6.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.6.yaml index 2bd09b37a5b2..8ccbc906c5c7 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.6.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.6.yaml @@ -195,10 +195,6 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: gcp -- as: e2e-aws - steps: - cluster_profile: aws - workflow: origin-e2e-aws-loki - as: e2e-aws-ovn steps: cluster_profile: aws From 0079103ed09514aa50e195b37c5dcb6750daf2f7 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 13 May 2020 00:01:57 +0000 Subject: [PATCH 3/3] ci-operator-prowgen --from-dir ./ci-operator/config --to-dir ./ci-operator/jobs --- ...enshift-priv-origin-master-presubmits.yaml | 84 ------------------- ...ft-priv-origin-release-4.6-presubmits.yaml | 84 ------------------- ...enshift-origin-release-4.6-presubmits.yaml | 75 ----------------- 3 files changed, 243 deletions(-) diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-master-presubmits.yaml index 6ce90401e92e..42a94f29b92e 100644 --- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-master-presubmits.yaml @@ -1,89 +1,5 @@ presubmits: openshift-priv/origin: - - agent: kubernetes - always_run: true - branches: - - master - cluster: build01 - context: ci/prow/e2e-aws - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-origin-master-e2e-aws - path_alias: github.com/openshift/origin - rerun_command: /test e2e-aws - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --lease-server-password-file=/etc/boskos/password - - --oauth-token-path=/usr/local/github-credentials/oauth - - --report-password-file=/etc/report/password.txt - - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile - name: cluster-profile - - mountPath: /usr/local/github-credentials - name: github-credentials-openshift-ci-robot-private-git-cloner - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-aws - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - - name: pull-secret - secret: - secretName: regcred - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.6-presubmits.yaml index 59bcecd61922..9879110b2cce 100644 --- a/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/origin/openshift-priv-origin-release-4.6-presubmits.yaml @@ -1,89 +1,5 @@ presubmits: openshift-priv/origin: - - agent: kubernetes - always_run: true - branches: - - release-4.6 - cluster: build01 - context: ci/prow/e2e-aws - decorate: true - decoration_config: - skip_cloning: true - hidden: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-origin-release-4.6-e2e-aws - path_alias: github.com/openshift/origin - rerun_command: /test e2e-aws - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --lease-server-password-file=/etc/boskos/password - - --oauth-token-path=/usr/local/github-credentials/oauth - - --report-password-file=/etc/report/password.txt - - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile - name: cluster-profile - - mountPath: /usr/local/github-credentials - name: github-credentials-openshift-ci-robot-private-git-cloner - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-aws - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - - name: pull-secret - secret: - secretName: regcred - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.6-presubmits.yaml index 60e2d9f5a3fc..829a43cb302a 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.6-presubmits.yaml @@ -48,81 +48,6 @@ presubmits: secret: secretName: regcred trigger: (?m)^/test( | .* )artifacts,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - release-4.6 - cluster: api.ci - context: ci/prow/e2e-aws - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-origin-release-4.6-e2e-aws - rerun_command: /test e2e-aws - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --lease-server-password-file=/etc/boskos/password - - --report-password-file=/etc/report/password.txt - - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-cluster-profile - - --target=e2e-aws - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-aws-cluster-profile - name: cluster-profile - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-aws - - name: pull-secret - secret: - secretName: regcred - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - agent: kubernetes always_run: true branches: