Skip to content

Commit 749ab66

Browse files
authored
[cnv-ci] Don't run presubmit jobs of old versions on master branch (#73005)
If a PR is opened against the master branch of github.com/openshift-cnv/cnv-ci repo, don't run the presubmits of old versions, but make them run only if explicitly requested. Signed-off-by: Oren Cohen <ocohen@redhat.com>
1 parent 5158aaf commit 749ab66

6 files changed

Lines changed: 350 additions & 24 deletions

ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__4.12.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ resources:
3535
cpu: 100m
3636
memory: 600Mi
3737
tests:
38-
- as: e2e-deploy
38+
- always_run: false
39+
as: e2e-deploy
3940
steps:
4041
cluster_profile: azure-virtualization
4142
env:
@@ -69,7 +70,8 @@ tests:
6970
cpu: 100m
7071
memory: 600Mi
7172
workflow: ipi-azure
72-
- as: e2e-upgrade
73+
- always_run: false
74+
as: e2e-upgrade
7375
steps:
7476
cluster_profile: azure-virtualization
7577
env:

ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__4.13.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ resources:
3535
cpu: 100m
3636
memory: 600Mi
3737
tests:
38-
- as: e2e-deploy
38+
- always_run: false
39+
as: e2e-deploy
3940
steps:
4041
cluster_profile: azure-virtualization
4142
env:
@@ -69,7 +70,8 @@ tests:
6970
cpu: 100m
7071
memory: 600Mi
7172
workflow: ipi-azure
72-
- as: e2e-upgrade
73+
- always_run: false
74+
as: e2e-upgrade
7375
steps:
7476
cluster_profile: azure-virtualization
7577
env:

ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__4.14.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ resources:
3535
cpu: 100m
3636
memory: 600Mi
3737
tests:
38-
- as: e2e-deploy
38+
- always_run: false
39+
as: e2e-deploy
3940
steps:
4041
cluster_profile: azure-virtualization
4142
env:
@@ -69,7 +70,8 @@ tests:
6970
cpu: 100m
7071
memory: 600Mi
7172
workflow: ipi-azure
72-
- as: e2e-upgrade
73+
- always_run: false
74+
as: e2e-upgrade
7375
steps:
7476
cluster_profile: azure-virtualization
7577
env:

ci-operator/config/openshift-cnv/cnv-ci/openshift-cnv-cnv-ci-master__4.16.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ resources:
3535
cpu: 100m
3636
memory: 600Mi
3737
tests:
38-
- as: e2e-deploy
38+
- always_run: false
39+
as: e2e-deploy
3940
steps:
4041
cluster_profile: azure-virtualization
4142
env:
@@ -69,7 +70,8 @@ tests:
6970
cpu: 100m
7071
memory: 600Mi
7172
workflow: ipi-azure
72-
- as: e2e-upgrade
73+
- always_run: false
74+
as: e2e-upgrade
7375
steps:
7476
cluster_profile: azure-virtualization
7577
env:
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
base_images:
2+
cli:
3+
name: "4.21"
4+
namespace: ocp
5+
tag: cli
6+
build_root:
7+
image_stream_tag:
8+
name: release
9+
namespace: openshift
10+
tag: golang-1.24
11+
images:
12+
- dockerfile_path: hack/Dockerfile.upgrade.src.ci
13+
from: src
14+
inputs:
15+
cli:
16+
paths:
17+
- destination_dir: .
18+
source_path: /usr/bin/oc
19+
to: src-upgrade-ci
20+
releases:
21+
initial:
22+
integration:
23+
name: "4.21"
24+
namespace: ocp
25+
latest:
26+
integration:
27+
include_built_images: true
28+
name: "4.21"
29+
namespace: ocp
30+
resources:
31+
'*':
32+
limits:
33+
memory: 4Gi
34+
requests:
35+
cpu: 100m
36+
memory: 600Mi
37+
tests:
38+
- as: e2e-deploy
39+
steps:
40+
cluster_profile: azure-virtualization
41+
env:
42+
BASE_DOMAIN: cnv-devel.azure.devcluster.openshift.com
43+
COMPUTE_NODE_TYPE: Standard_D4s_v5
44+
test:
45+
- as: test
46+
cli: latest
47+
commands: make deploy_test
48+
credentials:
49+
- collection: ""
50+
mount_path: /var/run/cnv-ci-brew-pull-secret
51+
name: cnv-ci-brew-pull-secret
52+
namespace: test-credentials
53+
env:
54+
- default: '|7820aea2-0d75-11e7-9259-28d244ea5a6d.hhav.f63e13'
55+
name: BREW_IMAGE_REGISTRY_USERNAME
56+
- default: /var/run/cnv-ci-brew-pull-secret/token
57+
name: BREW_IMAGE_REGISTRY_TOKEN_PATH
58+
- default: v1.7.0
59+
name: KUBEVIRT_RELEASE
60+
- default: "4.21"
61+
name: OCP_VERSION
62+
- default: /tmp/artifacts
63+
name: ARTIFACTS_DIR
64+
- default: openshift-cnv
65+
name: TARGET_NAMESPACE
66+
from: src
67+
resources:
68+
requests:
69+
cpu: 100m
70+
memory: 600Mi
71+
workflow: ipi-azure
72+
- as: e2e-upgrade
73+
steps:
74+
cluster_profile: azure-virtualization
75+
env:
76+
BASE_DOMAIN: cnv-devel.azure.devcluster.openshift.com
77+
COMPUTE_NODE_TYPE: Standard_D4s_v5
78+
test:
79+
- as: test
80+
commands: make upgrade_test
81+
credentials:
82+
- collection: ""
83+
mount_path: /var/run/cnv-ci-brew-pull-secret
84+
name: cnv-ci-brew-pull-secret
85+
namespace: test-credentials
86+
env:
87+
- default: '|7820aea2-0d75-11e7-9259-28d244ea5a6d.hhav.f63e13'
88+
name: BREW_IMAGE_REGISTRY_USERNAME
89+
- default: /var/run/cnv-ci-brew-pull-secret/token
90+
name: BREW_IMAGE_REGISTRY_TOKEN_PATH
91+
- default: v1.7.0
92+
name: KUBEVIRT_RELEASE
93+
- default: "4.21"
94+
name: OCP_VERSION
95+
- default: /tmp/artifacts
96+
name: ARTIFACTS_DIR
97+
- default: openshift-cnv
98+
name: TARGET_NAMESPACE
99+
from: src-upgrade-ci
100+
resources:
101+
requests:
102+
cpu: 100m
103+
memory: 600Mi
104+
workflow: ipi-azure
105+
zz_generated_metadata:
106+
branch: master
107+
org: openshift-cnv
108+
repo: cnv-ci
109+
variant: "4.21"

0 commit comments

Comments
 (0)