From 2cca86a6bf05c468bc871852436ecf6b5e523486 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 07:01:58 +0000 Subject: [PATCH 1/4] config-brancher --config-dir ./ci-operator/config --current-release 4.6 --future-release 4.7 --confirm --- .../kubernetes/openshift-kubernetes-release-4.6.yaml | 12 ++++++------ .../kubernetes/openshift-kubernetes-release-4.7.yaml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.6.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.6.yaml index 20d6b96f99cf..51f6054a0fa9 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.6.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.6.yaml @@ -133,10 +133,6 @@ resources: requests: cpu: "4" memory: 8Gi - e2e-conformance-k8s: - requests: - cpu: "1" - memory: 300Mi hyperkube: requests: cpu: "3" @@ -149,6 +145,10 @@ resources: requests: cpu: "6" memory: 14Gi + k8s-e2e-conformance-aws: + requests: + cpu: "1" + memory: 300Mi rpms: requests: cpu: "4" @@ -198,7 +198,7 @@ tests: memory_backed_volume: size: 4Gi - artifact_dir: /tmp/artifacts - as: gcp-e2e-kubernetes + as: k8s-e2e-gcp steps: cluster_profile: gcp workflow: openshift-kubernetes-e2e-gcp @@ -247,7 +247,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: vsphere -- as: e2e-conformance-k8s +- as: k8s-e2e-conformance-aws commands: openshift-hack/conformance-k8s.sh openshift_installer_src: cluster_profile: aws diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml index 1880dd8cac70..5fd80642d353 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.7.yaml @@ -132,10 +132,6 @@ resources: requests: cpu: "4" memory: 8Gi - e2e-conformance-k8s: - requests: - cpu: "1" - memory: 300Mi hyperkube: requests: cpu: "3" @@ -148,6 +144,10 @@ resources: requests: cpu: "6" memory: 14Gi + k8s-e2e-conformance-aws: + requests: + cpu: "1" + memory: 300Mi rpms: requests: cpu: "4" @@ -197,7 +197,7 @@ tests: memory_backed_volume: size: 4Gi - artifact_dir: /tmp/artifacts - as: gcp-e2e-kubernetes + as: k8s-e2e-gcp steps: cluster_profile: gcp workflow: openshift-kubernetes-e2e-gcp @@ -246,7 +246,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: vsphere -- as: e2e-conformance-k8s +- as: k8s-e2e-conformance-aws commands: openshift-hack/conformance-k8s.sh openshift_installer_src: cluster_profile: aws From b84c6eceda3d22f2ec4e94c5ddad587049753756 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 07:02:01 +0000 Subject: [PATCH 2/4] ci-operator-config-mirror --config-path ./ci-operator/config --to-org openshift-priv --only-org openshift --whitelist-file ./core-services/openshift-priv/_whitelist.yaml --- ...-priv-cluster-kube-apiserver-operator-master.yaml | 5 +++++ ...-cluster-kube-apiserver-operator-release-4.6.yaml | 5 +++++ ...-cluster-kube-apiserver-operator-release-4.7.yaml | 5 +++++ .../kubernetes/openshift-priv-kubernetes-master.yaml | 12 ++++++------ .../openshift-priv-kubernetes-release-4.6.yaml | 12 ++++++------ .../openshift-priv-kubernetes-release-4.7.yaml | 12 ++++++------ 6 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml index 80719d2c55fc..8f8af6d3ea88 100644 --- a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master.yaml @@ -55,6 +55,11 @@ tests: make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables container: from: test-bin +- artifact_dir: /tmp/artifacts + as: k8s-e2e-gcp + steps: + cluster_profile: gcp + workflow: openshift-kubernetes-e2e-gcp - as: e2e-aws steps: cluster_profile: aws diff --git a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6.yaml b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6.yaml index 09b7e32cbfaf..5bac51f7ce62 100644 --- a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6.yaml +++ b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6.yaml @@ -56,6 +56,11 @@ tests: make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables container: from: test-bin +- artifact_dir: /tmp/artifacts + as: k8s-e2e-gcp + steps: + cluster_profile: gcp + workflow: openshift-kubernetes-e2e-gcp - as: e2e-aws steps: cluster_profile: aws diff --git a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7.yaml b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7.yaml index f6358ffe7453..fa8f26d30371 100644 --- a/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7.yaml +++ b/ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7.yaml @@ -55,6 +55,11 @@ tests: make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables container: from: test-bin +- artifact_dir: /tmp/artifacts + as: k8s-e2e-gcp + steps: + cluster_profile: gcp + workflow: openshift-kubernetes-e2e-gcp - as: e2e-aws steps: cluster_profile: aws diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml index e623e9c0b05b..4baba3b77044 100644 --- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml +++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml @@ -132,10 +132,6 @@ resources: requests: cpu: "4" memory: 8Gi - e2e-conformance-k8s: - requests: - cpu: "1" - memory: 300Mi hyperkube: requests: cpu: "3" @@ -148,6 +144,10 @@ resources: requests: cpu: "6" memory: 14Gi + k8s-e2e-conformance-aws: + requests: + cpu: "1" + memory: 300Mi rpms: requests: cpu: "4" @@ -197,7 +197,7 @@ tests: memory_backed_volume: size: 4Gi - artifact_dir: /tmp/artifacts - as: gcp-e2e-kubernetes + as: k8s-e2e-gcp steps: cluster_profile: gcp workflow: openshift-kubernetes-e2e-gcp @@ -246,7 +246,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: vsphere -- as: e2e-conformance-k8s +- as: k8s-e2e-conformance-aws commands: openshift-hack/conformance-k8s.sh openshift_installer_src: cluster_profile: aws diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6.yaml index cd23cdf9c2a4..531cafe9bcf2 100644 --- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6.yaml +++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6.yaml @@ -133,10 +133,6 @@ resources: requests: cpu: "4" memory: 8Gi - e2e-conformance-k8s: - requests: - cpu: "1" - memory: 300Mi hyperkube: requests: cpu: "3" @@ -149,6 +145,10 @@ resources: requests: cpu: "6" memory: 14Gi + k8s-e2e-conformance-aws: + requests: + cpu: "1" + memory: 300Mi rpms: requests: cpu: "4" @@ -198,7 +198,7 @@ tests: memory_backed_volume: size: 4Gi - artifact_dir: /tmp/artifacts - as: gcp-e2e-kubernetes + as: k8s-e2e-gcp steps: cluster_profile: gcp workflow: openshift-kubernetes-e2e-gcp @@ -247,7 +247,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: vsphere -- as: e2e-conformance-k8s +- as: k8s-e2e-conformance-aws commands: openshift-hack/conformance-k8s.sh openshift_installer_src: cluster_profile: aws diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml index af7bdb027b4c..0d5f7dc89c31 100644 --- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml +++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7.yaml @@ -132,10 +132,6 @@ resources: requests: cpu: "4" memory: 8Gi - e2e-conformance-k8s: - requests: - cpu: "1" - memory: 300Mi hyperkube: requests: cpu: "3" @@ -148,6 +144,10 @@ resources: requests: cpu: "6" memory: 14Gi + k8s-e2e-conformance-aws: + requests: + cpu: "1" + memory: 300Mi rpms: requests: cpu: "4" @@ -197,7 +197,7 @@ tests: memory_backed_volume: size: 4Gi - artifact_dir: /tmp/artifacts - as: gcp-e2e-kubernetes + as: k8s-e2e-gcp steps: cluster_profile: gcp workflow: openshift-kubernetes-e2e-gcp @@ -246,7 +246,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: vsphere -- as: e2e-conformance-k8s +- as: k8s-e2e-conformance-aws commands: openshift-hack/conformance-k8s.sh openshift_installer_src: cluster_profile: aws From c976137c51b92cef1dee867c5c0083213b98de55 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 07:02:31 +0000 Subject: [PATCH 3/4] ci-operator-prowgen --from-dir ./ci-operator/config --to-dir ./ci-operator/jobs --- ...-apiserver-operator-master-presubmits.yaml | 73 ++++++ ...erver-operator-release-4.6-presubmits.yaml | 73 ++++++ ...erver-operator-release-4.7-presubmits.yaml | 73 ++++++ ...ift-priv-kubernetes-master-presubmits.yaml | 226 +++++++++-------- ...riv-kubernetes-release-4.6-presubmits.yaml | 226 +++++++++-------- ...riv-kubernetes-release-4.7-presubmits.yaml | 226 +++++++++-------- ...ift-kubernetes-release-4.6-presubmits.yaml | 226 +++++++++-------- ...ift-kubernetes-release-4.7-presubmits.yaml | 228 +++++++++--------- 8 files changed, 780 insertions(+), 571 deletions(-) diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml index 382136488c23..7017a9d06a64 100644 --- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml @@ -531,6 +531,79 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/k8s-e2e-gcp + 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-cluster-kube-apiserver-operator-master-k8s-e2e-gcp + path_alias: github.com/openshift/cluster-kube-apiserver-operator + rerun_command: /test k8s-e2e-gcp + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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/k8s-e2e-gcp-cluster-profile + - --target=k8s-e2e-gcp + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-gcp-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: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - 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( | .* )k8s-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml index cec498fa23d5..6755a5a07986 100644 --- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml @@ -531,6 +531,79 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.6 + context: ci/prow/k8s-e2e-gcp + 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-cluster-kube-apiserver-operator-release-4.6-k8s-e2e-gcp + path_alias: github.com/openshift/cluster-kube-apiserver-operator + rerun_command: /test k8s-e2e-gcp + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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/k8s-e2e-gcp-cluster-profile + - --target=k8s-e2e-gcp + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-gcp-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: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - 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( | .* )k8s-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml index 113e67df5a22..9963dc5a5aef 100644 --- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml @@ -531,6 +531,79 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.7 + context: ci/prow/k8s-e2e-gcp + 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-cluster-kube-apiserver-operator-release-4.7-k8s-e2e-gcp + path_alias: github.com/openshift/cluster-kube-apiserver-operator + rerun_command: /test k8s-e2e-gcp + spec: + containers: + - args: + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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/k8s-e2e-gcp-cluster-profile + - --target=k8s-e2e-gcp + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-gcp-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: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - 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( | .* )k8s-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-master-presubmits.yaml index 2ae09e3b2ca6..d433474d724e 100644 --- a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-master-presubmits.yaml @@ -597,7 +597,7 @@ presubmits: branches: - master cluster: api.ci - context: ci/prow/e2e-conformance-k8s + context: ci/prow/e2e-gcp decorate: true decoration_config: skip_cloning: true @@ -605,9 +605,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-master-e2e-conformance-k8s + name: pull-ci-openshift-priv-kubernetes-master-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test e2e-conformance-k8s + rerun_command: /test e2e-gcp spec: containers: - args: @@ -616,18 +616,10 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-conformance-k8s-cluster-profile - - --target=e2e-conformance-k8s - - --template=/usr/local/e2e-conformance-k8s + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: JOB_NAME_SAFE - value: e2e-conformance-k8s - - name: TEST_COMMAND - value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -638,14 +630,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-conformance-k8s-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true - - mountPath: /usr/local/e2e-conformance-k8s - name: job-definition - subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -664,26 +653,25 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner - - configMap: - name: prow-job-cluster-launch-installer-src - name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-conformance-k8s,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: api.ci - context: ci/prow/e2e-gcp + context: ci/prow/e2e-gcp-upgrade decorate: true decoration_config: skip_cloning: true @@ -691,9 +679,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-master-e2e-gcp + name: pull-ci-openshift-priv-kubernetes-master-e2e-gcp-upgrade path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -702,8 +690,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -716,7 +704,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner @@ -751,13 +739,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: api.ci - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-vsphere decorate: true decoration_config: skip_cloning: true @@ -765,9 +753,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-master-e2e-gcp-upgrade + name: pull-ci-openshift-priv-kubernetes-master-e2e-vsphere path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp-upgrade + rerun_command: /test e2e-vsphere spec: containers: - args: @@ -776,10 +764,18 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --template=/usr/local/e2e-vsphere command: - ci-operator + env: + - name: CLUSTER_TYPE + value: vsphere + - name: JOB_NAME_SAFE + value: e2e-vsphere + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -790,11 +786,14 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-vsphere-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true + - mountPath: /usr/local/e2e-vsphere + name: job-definition + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -813,25 +812,26 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-vsphere - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner + - configMap: + name: prow-job-cluster-launch-installer-upi-e2e + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: api.ci - context: ci/prow/e2e-vsphere + context: ci/prow/images decorate: true decoration_config: skip_cloning: true @@ -839,29 +839,20 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-master-e2e-vsphere + name: pull-ci-openshift-priv-kubernetes-master-images path_alias: k8s.io/kubernetes - rerun_command: /test e2e-vsphere + rerun_command: /test images spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --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-vsphere-cluster-profile - - --target=e2e-vsphere - - --template=/usr/local/e2e-vsphere + - --target=[images] + - --target=artifacts command: - ci-operator - env: - - name: CLUSTER_TYPE - value: vsphere - - name: JOB_NAME_SAFE - value: e2e-vsphere - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -869,17 +860,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-vsphere-cluster-profile - name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true - - mountPath: /usr/local/e2e-vsphere - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -888,36 +871,22 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-vsphere - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: api.ci - context: ci/prow/gcp-e2e-kubernetes + context: ci/prow/integration decorate: true decoration_config: skip_cloning: true @@ -925,19 +894,17 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-master-gcp-e2e-kubernetes + name: pull-ci-openshift-priv-kubernetes-master-integration path_alias: k8s.io/kubernetes - rerun_command: /test gcp-e2e-kubernetes + rerun_command: /test integration spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --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/gcp-e2e-kubernetes-cluster-profile - - --target=gcp-e2e-kubernetes + - --target=integration command: - ci-operator image: ci-operator:latest @@ -947,11 +914,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/gcp-e2e-kubernetes-cluster-profile - name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true @@ -963,19 +925,6 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner @@ -985,13 +934,12 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )gcp-e2e-kubernetes,?($|\s.*) + trigger: (?m)^/test( | .* )integration,?($|\s.*) - agent: kubernetes always_run: true branches: - master - cluster: api.ci - context: ci/prow/images + context: ci/prow/k8s-e2e-conformance-aws decorate: true decoration_config: skip_cloning: true @@ -999,20 +947,29 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-master-images + name: pull-ci-openshift-priv-kubernetes-master-k8s-e2e-conformance-aws path_alias: k8s.io/kubernetes - rerun_command: /test images + rerun_command: /test k8s-e2e-conformance-aws spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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 - - --target=[images] - - --target=artifacts + - --secret-dir=/usr/local/k8s-e2e-conformance-aws-cluster-profile + - --target=k8s-e2e-conformance-aws + - --template=/usr/local/k8s-e2e-conformance-aws command: - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: k8s-e2e-conformance-aws + - name: TEST_COMMAND + value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -1020,9 +977,17 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-conformance-aws-cluster-profile + name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true + - mountPath: /usr/local/k8s-e2e-conformance-aws + name: job-definition + subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -1031,22 +996,35 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - 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 + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-conformance-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - master - cluster: api.ci - context: ci/prow/integration + context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: skip_cloning: true @@ -1054,17 +1032,19 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-master-integration + name: pull-ci-openshift-priv-kubernetes-master-k8s-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test integration + rerun_command: /test k8s-e2e-gcp spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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 - - --target=integration + - --secret-dir=/usr/local/k8s-e2e-gcp-cluster-profile + - --target=k8s-e2e-gcp command: - ci-operator image: ci-operator:latest @@ -1074,6 +1054,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-gcp-cluster-profile + name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true @@ -1085,6 +1070,19 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner @@ -1094,7 +1092,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )integration,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6-presubmits.yaml index dd4a05e2d429..e88470055d6c 100644 --- a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6-presubmits.yaml @@ -597,7 +597,7 @@ presubmits: branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-conformance-k8s + context: ci/prow/e2e-gcp decorate: true decoration_config: skip_cloning: true @@ -605,9 +605,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.6-e2e-conformance-k8s + name: pull-ci-openshift-priv-kubernetes-release-4.6-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test e2e-conformance-k8s + rerun_command: /test e2e-gcp spec: containers: - args: @@ -616,18 +616,10 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-conformance-k8s-cluster-profile - - --target=e2e-conformance-k8s - - --template=/usr/local/e2e-conformance-k8s + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: JOB_NAME_SAFE - value: e2e-conformance-k8s - - name: TEST_COMMAND - value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -638,14 +630,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-conformance-k8s-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true - - mountPath: /usr/local/e2e-conformance-k8s - name: job-definition - subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -664,26 +653,25 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner - - configMap: - name: prow-job-cluster-launch-installer-src - name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-conformance-k8s,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-gcp + context: ci/prow/e2e-gcp-upgrade decorate: true decoration_config: skip_cloning: true @@ -691,9 +679,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.6-e2e-gcp + name: pull-ci-openshift-priv-kubernetes-release-4.6-e2e-gcp-upgrade path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -702,8 +690,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -716,7 +704,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner @@ -751,13 +739,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-vsphere decorate: true decoration_config: skip_cloning: true @@ -765,9 +753,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.6-e2e-gcp-upgrade + name: pull-ci-openshift-priv-kubernetes-release-4.6-e2e-vsphere path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp-upgrade + rerun_command: /test e2e-vsphere spec: containers: - args: @@ -776,10 +764,18 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --template=/usr/local/e2e-vsphere command: - ci-operator + env: + - name: CLUSTER_TYPE + value: vsphere + - name: JOB_NAME_SAFE + value: e2e-vsphere + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -790,11 +786,14 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-vsphere-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true + - mountPath: /usr/local/e2e-vsphere + name: job-definition + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -813,25 +812,26 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-vsphere - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner + - configMap: + name: prow-job-cluster-launch-installer-upi-e2e + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-vsphere + context: ci/prow/images decorate: true decoration_config: skip_cloning: true @@ -839,29 +839,20 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.6-e2e-vsphere + name: pull-ci-openshift-priv-kubernetes-release-4.6-images path_alias: k8s.io/kubernetes - rerun_command: /test e2e-vsphere + rerun_command: /test images spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --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-vsphere-cluster-profile - - --target=e2e-vsphere - - --template=/usr/local/e2e-vsphere + - --target=[images] + - --target=artifacts command: - ci-operator - env: - - name: CLUSTER_TYPE - value: vsphere - - name: JOB_NAME_SAFE - value: e2e-vsphere - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -869,17 +860,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-vsphere-cluster-profile - name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true - - mountPath: /usr/local/e2e-vsphere - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -888,36 +871,22 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-vsphere - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/gcp-e2e-kubernetes + context: ci/prow/integration decorate: true decoration_config: skip_cloning: true @@ -925,19 +894,17 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.6-gcp-e2e-kubernetes + name: pull-ci-openshift-priv-kubernetes-release-4.6-integration path_alias: k8s.io/kubernetes - rerun_command: /test gcp-e2e-kubernetes + rerun_command: /test integration spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --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/gcp-e2e-kubernetes-cluster-profile - - --target=gcp-e2e-kubernetes + - --target=integration command: - ci-operator image: ci-operator:latest @@ -947,11 +914,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/gcp-e2e-kubernetes-cluster-profile - name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true @@ -963,19 +925,6 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner @@ -985,13 +934,12 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )gcp-e2e-kubernetes,?($|\s.*) + trigger: (?m)^/test( | .* )integration,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 - cluster: api.ci - context: ci/prow/images + context: ci/prow/k8s-e2e-conformance-aws decorate: true decoration_config: skip_cloning: true @@ -999,20 +947,29 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.6-images + name: pull-ci-openshift-priv-kubernetes-release-4.6-k8s-e2e-conformance-aws path_alias: k8s.io/kubernetes - rerun_command: /test images + rerun_command: /test k8s-e2e-conformance-aws spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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 - - --target=[images] - - --target=artifacts + - --secret-dir=/usr/local/k8s-e2e-conformance-aws-cluster-profile + - --target=k8s-e2e-conformance-aws + - --template=/usr/local/k8s-e2e-conformance-aws command: - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: k8s-e2e-conformance-aws + - name: TEST_COMMAND + value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -1020,9 +977,17 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-conformance-aws-cluster-profile + name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true + - mountPath: /usr/local/k8s-e2e-conformance-aws + name: job-definition + subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -1031,22 +996,35 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - 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 + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-conformance-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 - cluster: api.ci - context: ci/prow/integration + context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: skip_cloning: true @@ -1054,17 +1032,19 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.6-integration + name: pull-ci-openshift-priv-kubernetes-release-4.6-k8s-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test integration + rerun_command: /test k8s-e2e-gcp spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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 - - --target=integration + - --secret-dir=/usr/local/k8s-e2e-gcp-cluster-profile + - --target=k8s-e2e-gcp command: - ci-operator image: ci-operator:latest @@ -1074,6 +1054,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-gcp-cluster-profile + name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true @@ -1085,6 +1070,19 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner @@ -1094,7 +1092,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )integration,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7-presubmits.yaml index 33917e2fff71..dd0d8267d638 100644 --- a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7-presubmits.yaml @@ -597,7 +597,7 @@ presubmits: branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-conformance-k8s + context: ci/prow/e2e-gcp decorate: true decoration_config: skip_cloning: true @@ -605,9 +605,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.7-e2e-conformance-k8s + name: pull-ci-openshift-priv-kubernetes-release-4.7-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test e2e-conformance-k8s + rerun_command: /test e2e-gcp spec: containers: - args: @@ -616,18 +616,10 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-conformance-k8s-cluster-profile - - --target=e2e-conformance-k8s - - --template=/usr/local/e2e-conformance-k8s + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: JOB_NAME_SAFE - value: e2e-conformance-k8s - - name: TEST_COMMAND - value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -638,14 +630,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-conformance-k8s-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true - - mountPath: /usr/local/e2e-conformance-k8s - name: job-definition - subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -664,26 +653,25 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner - - configMap: - name: prow-job-cluster-launch-installer-src - name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-conformance-k8s,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-gcp + context: ci/prow/e2e-gcp-upgrade decorate: true decoration_config: skip_cloning: true @@ -691,9 +679,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.7-e2e-gcp + name: pull-ci-openshift-priv-kubernetes-release-4.7-e2e-gcp-upgrade path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -702,8 +690,8 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -716,7 +704,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner @@ -751,13 +739,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-vsphere decorate: true decoration_config: skip_cloning: true @@ -765,9 +753,9 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.7-e2e-gcp-upgrade + name: pull-ci-openshift-priv-kubernetes-release-4.7-e2e-vsphere path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp-upgrade + rerun_command: /test e2e-vsphere spec: containers: - args: @@ -776,10 +764,18 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --template=/usr/local/e2e-vsphere command: - ci-operator + env: + - name: CLUSTER_TYPE + value: vsphere + - name: JOB_NAME_SAFE + value: e2e-vsphere + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -790,11 +786,14 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-vsphere-cluster-profile name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true + - mountPath: /usr/local/e2e-vsphere + name: job-definition + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -813,25 +812,26 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-vsphere - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner + - configMap: + name: prow-job-cluster-launch-installer-upi-e2e + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-vsphere + context: ci/prow/images decorate: true decoration_config: skip_cloning: true @@ -839,29 +839,20 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.7-e2e-vsphere + name: pull-ci-openshift-priv-kubernetes-release-4.7-images path_alias: k8s.io/kubernetes - rerun_command: /test e2e-vsphere + rerun_command: /test images spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --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-vsphere-cluster-profile - - --target=e2e-vsphere - - --template=/usr/local/e2e-vsphere + - --target=[images] + - --target=artifacts command: - ci-operator - env: - - name: CLUSTER_TYPE - value: vsphere - - name: JOB_NAME_SAFE - value: e2e-vsphere - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -869,17 +860,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-vsphere-cluster-profile - name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true - - mountPath: /usr/local/e2e-vsphere - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -888,36 +871,22 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-vsphere - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/gcp-e2e-kubernetes + context: ci/prow/integration decorate: true decoration_config: skip_cloning: true @@ -925,19 +894,17 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.7-gcp-e2e-kubernetes + name: pull-ci-openshift-priv-kubernetes-release-4.7-integration path_alias: k8s.io/kubernetes - rerun_command: /test gcp-e2e-kubernetes + rerun_command: /test integration spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --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/gcp-e2e-kubernetes-cluster-profile - - --target=gcp-e2e-kubernetes + - --target=integration command: - ci-operator image: ci-operator:latest @@ -947,11 +914,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/gcp-e2e-kubernetes-cluster-profile - name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true @@ -963,19 +925,6 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner @@ -985,13 +934,12 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )gcp-e2e-kubernetes,?($|\s.*) + trigger: (?m)^/test( | .* )integration,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 - cluster: api.ci - context: ci/prow/images + context: ci/prow/k8s-e2e-conformance-aws decorate: true decoration_config: skip_cloning: true @@ -999,20 +947,29 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.7-images + name: pull-ci-openshift-priv-kubernetes-release-4.7-k8s-e2e-conformance-aws path_alias: k8s.io/kubernetes - rerun_command: /test images + rerun_command: /test k8s-e2e-conformance-aws spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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 - - --target=[images] - - --target=artifacts + - --secret-dir=/usr/local/k8s-e2e-conformance-aws-cluster-profile + - --target=k8s-e2e-conformance-aws + - --template=/usr/local/k8s-e2e-conformance-aws command: - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: k8s-e2e-conformance-aws + - name: TEST_COMMAND + value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -1020,9 +977,17 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-conformance-aws-cluster-profile + name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true + - mountPath: /usr/local/k8s-e2e-conformance-aws + name: job-definition + subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -1031,22 +996,35 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - 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 + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-conformance-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 - cluster: api.ci - context: ci/prow/integration + context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: skip_cloning: true @@ -1054,17 +1032,19 @@ presubmits: labels: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-kubernetes-release-4.7-integration + name: pull-ci-openshift-priv-kubernetes-release-4.7-k8s-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test integration + rerun_command: /test k8s-e2e-gcp spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --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 - - --target=integration + - --secret-dir=/usr/local/k8s-e2e-gcp-cluster-profile + - --target=k8s-e2e-gcp command: - ci-operator image: ci-operator:latest @@ -1074,6 +1054,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-gcp-cluster-profile + name: cluster-profile - mountPath: /usr/local/github-credentials name: github-credentials-openshift-ci-robot-private-git-cloner readOnly: true @@ -1085,6 +1070,19 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: github-credentials-openshift-ci-robot-private-git-cloner secret: secretName: github-credentials-openshift-ci-robot-private-git-cloner @@ -1094,7 +1092,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )integration,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml index b51bd905fce7..ddf4f5508287 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml @@ -533,16 +533,16 @@ presubmits: branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-conformance-k8s + context: ci/prow/e2e-gcp 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-kubernetes-release-4.6-e2e-conformance-k8s + name: pull-ci-openshift-kubernetes-release-4.6-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test e2e-conformance-k8s + rerun_command: /test e2e-gcp spec: containers: - args: @@ -550,18 +550,10 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-conformance-k8s-cluster-profile - - --target=e2e-conformance-k8s - - --template=/usr/local/e2e-conformance-k8s + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: JOB_NAME_SAFE - value: e2e-conformance-k8s - - name: TEST_COMMAND - value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -572,11 +564,8 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-conformance-k8s-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-conformance-k8s - name: job-definition - subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -595,32 +584,31 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-src - name: job-definition + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-conformance-k8s,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-gcp + context: ci/prow/e2e-gcp-upgrade 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-kubernetes-release-4.6-e2e-gcp + name: pull-ci-openshift-kubernetes-release-4.6-e2e-gcp-upgrade path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -628,8 +616,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -642,7 +630,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -671,22 +659,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-vsphere 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-kubernetes-release-4.6-e2e-gcp-upgrade + name: pull-ci-openshift-kubernetes-release-4.6-e2e-vsphere path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp-upgrade + rerun_command: /test e2e-vsphere spec: containers: - args: @@ -694,10 +682,18 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --template=/usr/local/e2e-vsphere command: - ci-operator + env: + - name: CLUSTER_TYPE + value: vsphere + - name: JOB_NAME_SAFE + value: e2e-vsphere + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -708,8 +704,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-vsphere-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-vsphere + name: job-definition + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -728,50 +727,42 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-vsphere + - configMap: + name: prow-job-cluster-launch-installer-upi-e2e + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-vsphere + context: ci/prow/images 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-kubernetes-release-4.6-e2e-vsphere + name: pull-ci-openshift-kubernetes-release-4.6-images path_alias: k8s.io/kubernetes - rerun_command: /test e2e-vsphere + rerun_command: /test images spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-vsphere-cluster-profile - - --target=e2e-vsphere - - --template=/usr/local/e2e-vsphere + - --target=[images] + - --target=artifacts command: - ci-operator - env: - - name: CLUSTER_TYPE - value: vsphere - - name: JOB_NAME_SAFE - value: e2e-vsphere - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -779,14 +770,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-vsphere-cluster-profile - name: cluster-profile - - mountPath: /usr/local/e2e-vsphere - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -795,51 +778,35 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-vsphere - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/gcp-e2e-kubernetes + context: ci/prow/integration 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-kubernetes-release-4.6-gcp-e2e-kubernetes + name: pull-ci-openshift-kubernetes-release-4.6-integration path_alias: k8s.io/kubernetes - rerun_command: /test gcp-e2e-kubernetes + rerun_command: /test integration spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/gcp-e2e-kubernetes-cluster-profile - - --target=gcp-e2e-kubernetes + - --target=integration command: - ci-operator image: ci-operator:latest @@ -849,11 +816,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/gcp-e2e-kubernetes-cluster-profile - name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -862,51 +824,46 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )gcp-e2e-kubernetes,?($|\s.*) + trigger: (?m)^/test( | .* )integration,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 - cluster: api.ci - context: ci/prow/images + context: ci/prow/k8s-e2e-conformance-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-kubernetes-release-4.6-images + name: pull-ci-openshift-kubernetes-release-4.6-k8s-e2e-conformance-aws path_alias: k8s.io/kubernetes - rerun_command: /test images + rerun_command: /test k8s-e2e-conformance-aws spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --target=[images] - - --target=artifacts + - --secret-dir=/usr/local/k8s-e2e-conformance-aws-cluster-profile + - --target=k8s-e2e-conformance-aws + - --template=/usr/local/k8s-e2e-conformance-aws command: - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: k8s-e2e-conformance-aws + - name: TEST_COMMAND + value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -914,6 +871,14 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-conformance-aws-cluster-profile + name: cluster-profile + - mountPath: /usr/local/k8s-e2e-conformance-aws + name: job-definition + subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -922,35 +887,50 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-conformance-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 - cluster: api.ci - context: ci/prow/integration + context: ci/prow/k8s-e2e-gcp 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-kubernetes-release-4.6-integration + name: pull-ci-openshift-kubernetes-release-4.6-k8s-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test integration + rerun_command: /test k8s-e2e-gcp spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --target=integration + - --secret-dir=/usr/local/k8s-e2e-gcp-cluster-profile + - --target=k8s-e2e-gcp command: - ci-operator image: ci-operator:latest @@ -960,6 +940,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-gcp-cluster-profile + name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -968,13 +953,26 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )integration,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml index cfd98b59b83a..a33e2c907e6e 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml @@ -533,16 +533,16 @@ presubmits: branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-conformance-k8s + context: ci/prow/e2e-gcp 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-kubernetes-release-4.7-e2e-conformance-k8s + name: pull-ci-openshift-kubernetes-release-4.7-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test e2e-conformance-k8s + rerun_command: /test e2e-gcp spec: containers: - args: @@ -550,18 +550,10 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-conformance-k8s-cluster-profile - - --target=e2e-conformance-k8s - - --template=/usr/local/e2e-conformance-k8s + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: JOB_NAME_SAFE - value: e2e-conformance-k8s - - name: TEST_COMMAND - value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -572,11 +564,8 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-conformance-k8s-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-conformance-k8s - name: job-definition - subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -595,32 +584,31 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-src - name: job-definition + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-conformance-k8s,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-gcp + context: ci/prow/e2e-gcp-upgrade 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-kubernetes-release-4.7-e2e-gcp + name: pull-ci-openshift-kubernetes-release-4.7-e2e-gcp-upgrade path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp + rerun_command: /test e2e-gcp-upgrade spec: containers: - args: @@ -628,8 +616,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator image: ci-operator:latest @@ -642,7 +630,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -671,22 +659,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-vsphere 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-kubernetes-release-4.7-e2e-gcp-upgrade + name: pull-ci-openshift-kubernetes-release-4.7-e2e-vsphere path_alias: k8s.io/kubernetes - rerun_command: /test e2e-gcp-upgrade + rerun_command: /test e2e-vsphere spec: containers: - args: @@ -694,10 +682,18 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-vsphere-cluster-profile + - --target=e2e-vsphere + - --template=/usr/local/e2e-vsphere command: - ci-operator + env: + - name: CLUSTER_TYPE + value: vsphere + - name: JOB_NAME_SAFE + value: e2e-vsphere + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -708,8 +704,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-vsphere-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-vsphere + name: job-definition + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -728,50 +727,43 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-vsphere + - configMap: + name: prow-job-cluster-launch-installer-upi-e2e + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-vsphere + context: ci/prow/images 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-kubernetes-release-4.7-e2e-vsphere + name: pull-ci-openshift-kubernetes-release-4.7-images path_alias: k8s.io/kubernetes - rerun_command: /test e2e-vsphere + rerun_command: /test images spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-vsphere-cluster-profile - - --target=e2e-vsphere - - --template=/usr/local/e2e-vsphere + - --target=[images] + - --target=[release:latest] + - --target=artifacts command: - ci-operator - env: - - name: CLUSTER_TYPE - value: vsphere - - name: JOB_NAME_SAFE - value: e2e-vsphere - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -779,14 +771,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/e2e-vsphere-cluster-profile - name: cluster-profile - - mountPath: /usr/local/e2e-vsphere - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -795,51 +779,35 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-vsphere - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-vsphere,?($|\s.*) + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/gcp-e2e-kubernetes + context: ci/prow/integration 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-kubernetes-release-4.7-gcp-e2e-kubernetes + name: pull-ci-openshift-kubernetes-release-4.7-integration path_alias: k8s.io/kubernetes - rerun_command: /test gcp-e2e-kubernetes + rerun_command: /test integration spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/gcp-e2e-kubernetes-cluster-profile - - --target=gcp-e2e-kubernetes + - --target=integration command: - ci-operator image: ci-operator:latest @@ -849,11 +817,6 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/gcp-e2e-kubernetes-cluster-profile - name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -862,52 +825,46 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: password - path: password - secretName: boskos-credentials - - name: cluster-profile - projected: - sources: - - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )gcp-e2e-kubernetes,?($|\s.*) + trigger: (?m)^/test( | .* )integration,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 - cluster: api.ci - context: ci/prow/images + context: ci/prow/k8s-e2e-conformance-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-kubernetes-release-4.7-images + name: pull-ci-openshift-kubernetes-release-4.7-k8s-e2e-conformance-aws path_alias: k8s.io/kubernetes - rerun_command: /test images + rerun_command: /test k8s-e2e-conformance-aws spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --target=[images] - - --target=[release:latest] - - --target=artifacts + - --secret-dir=/usr/local/k8s-e2e-conformance-aws-cluster-profile + - --target=k8s-e2e-conformance-aws + - --template=/usr/local/k8s-e2e-conformance-aws command: - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: k8s-e2e-conformance-aws + - name: TEST_COMMAND + value: openshift-hack/conformance-k8s.sh image: ci-operator:latest imagePullPolicy: Always name: "" @@ -915,6 +872,14 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-conformance-aws-cluster-profile + name: cluster-profile + - mountPath: /usr/local/k8s-e2e-conformance-aws + name: job-definition + subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -923,35 +888,50 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-conformance-aws,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 - cluster: api.ci - context: ci/prow/integration + context: ci/prow/k8s-e2e-gcp 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-kubernetes-release-4.7-integration + name: pull-ci-openshift-kubernetes-release-4.7-k8s-e2e-gcp path_alias: k8s.io/kubernetes - rerun_command: /test integration + rerun_command: /test k8s-e2e-gcp spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --target=integration + - --secret-dir=/usr/local/k8s-e2e-gcp-cluster-profile + - --target=k8s-e2e-gcp command: - ci-operator image: ci-operator:latest @@ -961,6 +941,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/k8s-e2e-gcp-cluster-profile + name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -969,13 +954,26 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )integration,?($|\s.*) + trigger: (?m)^/test( | .* )k8s-e2e-gcp,?($|\s.*) - agent: kubernetes always_run: true branches: From 5aa75da2fbf4fe940774ebef1b15aa69a106fce2 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 07:02:43 +0000 Subject: [PATCH 4/4] sanitize-prow-jobs --prow-jobs-dir ./ci-operator/jobs --config-path ./core-services/sanitize-prow-jobs/_config.yaml --- ...-priv-cluster-kube-apiserver-operator-master-presubmits.yaml | 1 + ...-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml | 1 + ...-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml | 1 + .../kubernetes/openshift-priv-kubernetes-master-presubmits.yaml | 2 ++ .../openshift-priv-kubernetes-release-4.6-presubmits.yaml | 2 ++ .../openshift-priv-kubernetes-release-4.7-presubmits.yaml | 2 ++ .../kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml | 2 ++ .../kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml | 2 ++ 8 files changed, 13 insertions(+) diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml index 7017a9d06a64..1f00f6a06bb6 100644 --- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-master-presubmits.yaml @@ -535,6 +535,7 @@ presubmits: always_run: true branches: - master + cluster: api.ci context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml index 6755a5a07986..1a56b2fa1c76 100644 --- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.6-presubmits.yaml @@ -535,6 +535,7 @@ presubmits: always_run: true branches: - release-4.6 + cluster: api.ci context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml index 9963dc5a5aef..4e77e7212b70 100644 --- a/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.7-presubmits.yaml @@ -535,6 +535,7 @@ presubmits: always_run: true branches: - release-4.7 + cluster: api.ci context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-master-presubmits.yaml index d433474d724e..b30240f3ca2a 100644 --- a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-master-presubmits.yaml @@ -939,6 +939,7 @@ presubmits: always_run: true branches: - master + cluster: api.ci context: ci/prow/k8s-e2e-conformance-aws decorate: true decoration_config: @@ -1024,6 +1025,7 @@ presubmits: always_run: true branches: - master + cluster: api.ci context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6-presubmits.yaml index e88470055d6c..aa8a16c60052 100644 --- a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.6-presubmits.yaml @@ -939,6 +939,7 @@ presubmits: always_run: true branches: - release-4.6 + cluster: api.ci context: ci/prow/k8s-e2e-conformance-aws decorate: true decoration_config: @@ -1024,6 +1025,7 @@ presubmits: always_run: true branches: - release-4.6 + cluster: api.ci context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7-presubmits.yaml index dd0d8267d638..4c03f2d1b5e0 100644 --- a/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.7-presubmits.yaml @@ -939,6 +939,7 @@ presubmits: always_run: true branches: - release-4.7 + cluster: api.ci context: ci/prow/k8s-e2e-conformance-aws decorate: true decoration_config: @@ -1024,6 +1025,7 @@ presubmits: always_run: true branches: - release-4.7 + cluster: api.ci context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml index ddf4f5508287..14c0ce33c226 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.6-presubmits.yaml @@ -835,6 +835,7 @@ presubmits: always_run: true branches: - release-4.6 + cluster: api.ci context: ci/prow/k8s-e2e-conformance-aws decorate: true decoration_config: @@ -912,6 +913,7 @@ presubmits: always_run: true branches: - release-4.6 + cluster: api.ci context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml index a33e2c907e6e..b8ac8d37e6e6 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-release-4.7-presubmits.yaml @@ -836,6 +836,7 @@ presubmits: always_run: true branches: - release-4.7 + cluster: api.ci context: ci/prow/k8s-e2e-conformance-aws decorate: true decoration_config: @@ -913,6 +914,7 @@ presubmits: always_run: true branches: - release-4.7 + cluster: api.ci context: ci/prow/k8s-e2e-gcp decorate: true decoration_config: