Skip to content

Commit b0087be

Browse files
committed
Move origin test to protected instead of skip_only (pipeline) and make ci-tools additional test skip_only
ci-tools edition is for more testing Signed-off-by: Jakub Guzik <[email protected]>
1 parent 138ec3e commit b0087be

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ tests:
913913
container:
914914
from: test-bin
915915
node_architecture: arm64
916-
pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/
916+
pipeline_skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
917917
- always_run: false
918918
as: e2e
919919
steps:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,10 +456,10 @@ tests:
456456
enable:
457457
- observers-resource-watch
458458
workflow: baremetalds-e2e-ovn-ipv4
459-
- as: e2e-metal-ipi-ovn-ipv6
459+
- always_run: false
460+
as: e2e-metal-ipi-ovn-ipv6
460461
capabilities:
461462
- intranet
462-
pipeline_skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
463463
steps:
464464
cluster_profile: equinix-ocp-metal
465465
observers:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ presubmits:
499499
- agent: kubernetes
500500
always_run: false
501501
annotations:
502-
pipeline_run_if_changed: (^|/)(Makefile|GNUmakefile)(\..*)?$|\.mk$|\.go$|\.sh$|^go\.mod$|^go\.sum$|(^|/)vendor/
502+
pipeline_skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
503503
branches:
504504
- ^main$
505505
- ^main-

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4398,8 +4398,6 @@ presubmits:
43984398
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack-local-gateway,?($|\s.*)
43994399
- agent: kubernetes
44004400
always_run: false
4401-
annotations:
4402-
pipeline_skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
44034401
branches:
44044402
- ^main$
44054403
- ^main-
@@ -4470,7 +4468,7 @@ presubmits:
44704468
- name: result-aggregator
44714469
secret:
44724470
secretName: result-aggregator
4473-
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
4471+
trigger: (?m)^/test( | .* )(e2e-metal-ipi-ovn-ipv6|remaining-required),?($|\s.*)
44744472
- agent: kubernetes
44754473
always_run: false
44764474
branches:

0 commit comments

Comments
 (0)