Skip to content

Commit 44046ec

Browse files
authored
NO-JIRA: Make microshift conditionally triggered on o/origin (#71011)
* o/origin: make microshift jobs conditionally triggered Motivated by openshift/origin#30453 where I modified OWNERS and had to pass microshift jobs. This setting is consistent with other e2e jobs. * `make update`
1 parent ee37fe0 commit 44046ec

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

ci-operator/config/openshift/origin/openshift-origin-main.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,7 @@ tests:
804804
workflow: upi-vsphere-platform-external-ccm
805805
timeout: 6h0m0s
806806
- as: e2e-aws-ovn-microshift
807+
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
807808
steps:
808809
cluster_profile: aws
809810
env:
@@ -813,6 +814,7 @@ tests:
813814
workflow: openshift-microshift-e2e-origin-conformance
814815
timeout: 6h0m0s
815816
- as: e2e-aws-ovn-microshift-serial
817+
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
816818
steps:
817819
cluster_profile: aws-2
818820
env:

ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ presubmits:
10261026
secretName: result-aggregator
10271027
trigger: (?m)^/test( | .* )e2e-aws-ovn-kubevirt,?($|\s.*)
10281028
- agent: kubernetes
1029-
always_run: true
1029+
always_run: false
10301030
branches:
10311031
- ^main$
10321032
- ^main-
@@ -1042,6 +1042,7 @@ presubmits:
10421042
pj-rehearse.openshift.io/can-be-rehearsed: "true"
10431043
name: pull-ci-openshift-origin-main-e2e-aws-ovn-microshift
10441044
rerun_command: /test e2e-aws-ovn-microshift
1045+
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
10451046
spec:
10461047
containers:
10471048
- args:
@@ -1100,7 +1101,7 @@ presubmits:
11001101
secretName: result-aggregator
11011102
trigger: (?m)^/test( | .* )e2e-aws-ovn-microshift,?($|\s.*)
11021103
- agent: kubernetes
1103-
always_run: true
1104+
always_run: false
11041105
branches:
11051106
- ^main$
11061107
- ^main-
@@ -1116,6 +1117,7 @@ presubmits:
11161117
pj-rehearse.openshift.io/can-be-rehearsed: "true"
11171118
name: pull-ci-openshift-origin-main-e2e-aws-ovn-microshift-serial
11181119
rerun_command: /test e2e-aws-ovn-microshift-serial
1120+
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
11191121
spec:
11201122
containers:
11211123
- args:

0 commit comments

Comments
 (0)