Skip to content

Commit 74c862e

Browse files
Merge pull request #23020 from JoelSpeed/revert-22940-bootstrap-e2e-dontalwaysrun
Rename MCO bootstrap presubmit and set it to always run
2 parents aec9896 + 07f7798 commit 74c862e

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ tests:
8585
make verify
8686
container:
8787
from: src
88-
- as: bootstrap-e2e
88+
- as: bootstrap-unit
8989
commands: make bootstrap-e2e
9090
container:
9191
from: src

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ tests:
8686
make verify
8787
container:
8888
from: src
89-
- as: bootstrap-e2e
89+
- as: bootstrap-unit
9090
commands: make bootstrap-e2e
9191
container:
9292
from: src

ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
presubmits:
22
openshift/machine-config-operator:
33
- agent: kubernetes
4-
always_run: false
4+
always_run: true
55
branches:
66
- ^master$
77
- ^master-
88
cluster: build02
9-
context: ci/prow/bootstrap-e2e
9+
context: ci/prow/bootstrap-unit
1010
decorate: true
1111
labels:
1212
ci.openshift.io/generator: prowgen
1313
pj-rehearse.openshift.io/can-be-rehearsed: "true"
14-
name: pull-ci-openshift-machine-config-operator-master-bootstrap-e2e
14+
name: pull-ci-openshift-machine-config-operator-master-bootstrap-unit
1515
optional: true
16-
rerun_command: /test bootstrap-e2e
16+
rerun_command: /test bootstrap-unit
1717
spec:
1818
containers:
1919
- args:
2020
- --gcs-upload-secret=/secrets/gcs/service-account.json
2121
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2222
- --report-credentials-file=/etc/report/credentials
23-
- --target=bootstrap-e2e
23+
- --target=bootstrap-unit
2424
command:
2525
- ci-operator
2626
image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
4747
- name: result-aggregator
4848
secret:
4949
secretName: result-aggregator
50-
trigger: (?m)^/test( | .* )bootstrap-e2e,?($|\s.*)
50+
trigger: (?m)^/test( | .* )bootstrap-unit,?($|\s.*)
5151
- agent: kubernetes
5252
always_run: false
5353
branches:

ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.10-presubmits.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
presubmits:
22
openshift/machine-config-operator:
33
- agent: kubernetes
4-
always_run: false
4+
always_run: true
55
branches:
66
- ^release-4\.10$
77
- ^release-4\.10-
88
cluster: build02
9-
context: ci/prow/bootstrap-e2e
9+
context: ci/prow/bootstrap-unit
1010
decorate: true
1111
labels:
1212
ci.openshift.io/generator: prowgen
1313
pj-rehearse.openshift.io/can-be-rehearsed: "true"
14-
name: pull-ci-openshift-machine-config-operator-release-4.10-bootstrap-e2e
14+
name: pull-ci-openshift-machine-config-operator-release-4.10-bootstrap-unit
1515
optional: true
16-
rerun_command: /test bootstrap-e2e
16+
rerun_command: /test bootstrap-unit
1717
spec:
1818
containers:
1919
- args:
2020
- --gcs-upload-secret=/secrets/gcs/service-account.json
2121
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
2222
- --report-credentials-file=/etc/report/credentials
23-
- --target=bootstrap-e2e
23+
- --target=bootstrap-unit
2424
command:
2525
- ci-operator
2626
image: ci-operator:latest
@@ -47,7 +47,7 @@ presubmits:
4747
- name: result-aggregator
4848
secret:
4949
secretName: result-aggregator
50-
trigger: (?m)^/test( | .* )bootstrap-e2e,?($|\s.*)
50+
trigger: (?m)^/test( | .* )bootstrap-unit,?($|\s.*)
5151
- agent: kubernetes
5252
always_run: false
5353
branches:

0 commit comments

Comments
 (0)