Skip to content

Switch e2e and e2e-upgrade jobs to gcp in-keeping with current norms #10618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jul 31, 2020
Merged

Switch e2e and e2e-upgrade jobs to gcp in-keeping with current norms #10618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ci-operator/config/openshift/oauth-server/openshift-oauth-server-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ tests:
make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables
container:
from: test-bin
- as: e2e-aws
- as: e2e-gcp
Copy link
Member

@wking wking Aug 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are platform-agnostic, can we name these e2e? Then you can pivot the backing platform as needed without having Prow get confused about the jobs being renamed. Docs. Examples: #10152, #10179, #10180, #10377.

Copy link
Contributor Author

@marun marun Aug 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The platform being targeted seems like a useful detail to expose. prow confusion is temporary, and how often do we really pivot jobs to different platforms?

Copy link
Member

@wking wking Aug 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The platform being targeted seems like a useful detail to expose.

It's still available if you need it. I don't see why it needs top billing in the job names on preflights for platform-agnostic repositories.

prow confusion is temporary, and how often do we really pivot jobs to different platforms?

This would be the fourth or fifth repo to pivot in the past month. By declaring yourself platform agnostic with a generic job name, you create a larger pool of reschedulable jobs that can be shifted to mitigate future capacity issues.

steps:
cluster_profile: aws
workflow: openshift-e2e-aws
- as: e2e-aws-upgrade
cluster_profile: gcp
workflow: openshift-e2e-gcp
- as: e2e-gcp-upgrade
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: aws
cluster_profile: gcp
upgrade: true
- as: e2e-aws-serial
steps:
Expand Down
50 changes: 27 additions & 23 deletions ci-operator/jobs/openshift/oauth-server/openshift-oauth-server-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ presubmits:
branches:
- master
cluster: api.ci
context: ci/prow/e2e-aws
context: ci/prow/e2e-aws-serial
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-oauth-server-master-e2e-aws
rerun_command: /test e2e-aws
name: pull-ci-openshift-oauth-server-master-e2e-aws-serial
rerun_command: /test e2e-aws-serial
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-aws-cluster-profile
- --target=e2e-aws
- --secret-dir=/usr/local/e2e-aws-serial-cluster-profile
- --target=e2e-aws-serial
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -35,7 +35,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-aws-cluster-profile
- mountPath: /usr/local/e2e-aws-serial-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand All @@ -62,30 +62,30 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- master
cluster: api.ci
context: ci/prow/e2e-aws-serial
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-oauth-server-master-e2e-aws-serial
rerun_command: /test e2e-aws-serial
name: pull-ci-openshift-oauth-server-master-e2e-gcp
rerun_command: /test 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
- --secret-dir=/usr/local/e2e-aws-serial-cluster-profile
- --target=e2e-aws-serial
- --secret-dir=/usr/local/e2e-gcp-cluster-profile
- --target=e2e-gcp
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -98,7 +98,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-aws-serial-cluster-profile
- mountPath: /usr/local/e2e-gcp-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand All @@ -118,37 +118,39 @@ presubmits:
projected:
sources:
- secret:
name: cluster-secrets-aws
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-aws-serial,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- master
cluster: api.ci
context: ci/prow/e2e-aws-upgrade
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-oauth-server-master-e2e-aws-upgrade
rerun_command: /test e2e-aws-upgrade
name: pull-ci-openshift-oauth-server-master-e2e-gcp-upgrade
rerun_command: /test e2e-gcp-upgrade
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-aws-upgrade-cluster-profile
- --target=e2e-aws-upgrade
- --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile
- --target=e2e-gcp-upgrade
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -161,7 +163,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
- mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand All @@ -181,14 +183,16 @@ presubmits:
projected:
sources:
- secret:
name: cluster-secrets-aws
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-aws-upgrade,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down