Skip to content

ci-operator/config/openshift/router: Generic e2e-aws -> e2e for 4.6+ #10179

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 10, 2020
Merged

ci-operator/config/openshift/router: Generic e2e-aws -> e2e for 4.6+ #10179

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/router/openshift-router-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ tests:
commands: go test -race ./...
container:
from: src
- as: e2e-aws
- as: e2e
steps:
cluster_profile: aws
workflow: openshift-e2e-aws
- as: e2e-aws-upgrade
cluster_profile: gcp
workflow: openshift-e2e-gcp
- as: e2e-upgrade
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: aws
cluster_profile: gcp
upgrade: true
zz_generated_metadata:
branch: master
Expand Down
10 changes: 5 additions & 5 deletions ci-operator/config/openshift/router/openshift-router-release-4.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ tests:
commands: go test -race ./...
container:
from: src
- as: e2e-aws
- as: e2e
steps:
cluster_profile: aws
workflow: openshift-e2e-aws
- as: e2e-aws-upgrade
cluster_profile: gcp
workflow: openshift-e2e-gcp
- as: e2e-upgrade
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: aws
cluster_profile: gcp
upgrade: true
zz_generated_metadata:
branch: release-4.6
Expand Down
10 changes: 5 additions & 5 deletions ci-operator/config/openshift/router/openshift-router-release-4.7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ tests:
commands: go test -race ./...
container:
from: src
- as: e2e-aws
- as: e2e
steps:
cluster_profile: aws
workflow: openshift-e2e-aws
- as: e2e-aws-upgrade
cluster_profile: gcp
workflow: openshift-e2e-gcp
- as: e2e-upgrade
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: aws
cluster_profile: gcp
upgrade: true
zz_generated_metadata:
branch: release-4.7
Expand Down
36 changes: 20 additions & 16 deletions ci-operator/jobs/openshift/router/openshift-router-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
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-router-master-e2e-aws
rerun_command: /test e2e-aws
name: pull-ci-openshift-router-master-e2e
rerun_command: /test e2e
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-cluster-profile
- --target=e2e
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-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand All @@ -55,37 +55,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,?($|\s.*)
trigger: (?m)^/test( | .* )e2e,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- master
cluster: api.ci
context: ci/prow/e2e-aws-upgrade
context: ci/prow/e2e-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-router-master-e2e-aws-upgrade
rerun_command: /test e2e-aws-upgrade
name: pull-ci-openshift-router-master-e2e-upgrade
rerun_command: /test e2e-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-upgrade-cluster-profile
- --target=e2e-upgrade
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -98,7 +100,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
- mountPath: /usr/local/e2e-upgrade-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand All @@ -118,14 +120,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-upgrade,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down
36 changes: 20 additions & 16 deletions ci-operator/jobs/openshift/router/openshift-router-release-4.6-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:
- release-4.6
cluster: api.ci
context: ci/prow/e2e-aws
context: ci/prow/e2e
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-router-release-4.6-e2e-aws
rerun_command: /test e2e-aws
name: pull-ci-openshift-router-release-4.6-e2e
rerun_command: /test e2e
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-cluster-profile
- --target=e2e
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-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand All @@ -55,37 +55,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,?($|\s.*)
trigger: (?m)^/test( | .* )e2e,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- release-4.6
cluster: api.ci
context: ci/prow/e2e-aws-upgrade
context: ci/prow/e2e-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-router-release-4.6-e2e-aws-upgrade
rerun_command: /test e2e-aws-upgrade
name: pull-ci-openshift-router-release-4.6-e2e-upgrade
rerun_command: /test e2e-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-upgrade-cluster-profile
- --target=e2e-upgrade
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -98,7 +100,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-aws-upgrade-cluster-profile
- mountPath: /usr/local/e2e-upgrade-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand All @@ -118,14 +120,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-upgrade,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down
Loading