Skip to content

machine-config-operator: fix tests in 4.6 and 4.7 to be in sync with master #12615

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
Oct 12, 2020
Merged

machine-config-operator: fix tests in 4.6 and 4.7 to be in sync with master #12615

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
6 changes: 4 additions & 2 deletions ...ift/machine-config-operator/openshift-machine-config-operator-release-4.6-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
presubmits:
openshift/machine-config-operator:
- agent: kubernetes
always_run: true
always_run: false
branches:
- release-4.6
cluster: build01
Expand Down Expand Up @@ -220,7 +220,7 @@ presubmits:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
- agent: kubernetes
always_run: true
always_run: false
branches:
- release-4.6
cluster: build01
Expand All @@ -232,6 +232,7 @@ presubmits:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-machine-config-operator-release-4.6-e2e-aws-proxy
optional: true
rerun_command: /test e2e-aws-proxy
spec:
containers:
Expand Down Expand Up @@ -503,6 +504,7 @@ presubmits:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-machine-config-operator-release-4.6-e2e-metal-ipi
optional: true
rerun_command: /test e2e-metal-ipi
spec:
containers:
Expand Down
6 changes: 4 additions & 2 deletions ...ift/machine-config-operator/openshift-machine-config-operator-release-4.7-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
presubmits:
openshift/machine-config-operator:
- agent: kubernetes
always_run: true
always_run: false
branches:
- release-4.7
cluster: build01
Expand Down Expand Up @@ -220,7 +220,7 @@ presubmits:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*)
- agent: kubernetes
always_run: true
always_run: false
branches:
- release-4.7
cluster: build01
Expand All @@ -232,6 +232,7 @@ presubmits:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-machine-config-operator-release-4.7-e2e-aws-proxy
optional: true
rerun_command: /test e2e-aws-proxy
spec:
containers:
Expand Down Expand Up @@ -503,6 +504,7 @@ presubmits:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-machine-config-operator-release-4.7-e2e-metal-ipi
optional: true
rerun_command: /test e2e-metal-ipi
spec:
containers:
Expand Down