Skip to content

Commit cc460a8

Browse files
author
Matt Rogers
authored
Add OLM upgrade test to file-integrity-operator (#30613)
1 parent 2f868cd commit cc460a8

File tree

2 files changed

+260
-0
lines changed

2 files changed

+260
-0
lines changed

‎ci-operator/config/openshift/file-integrity-operator/openshift-file-integrity-operator-master.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ base_images:
33
name: release
44
namespace: openshift
55
tag: rhel-8-release-golang-1.17-openshift-4.10
6+
operator-index:
7+
name: redhat-operator-index
8+
namespace: ci
9+
tag: v4.10
610
build_root:
711
image_stream_tag:
812
name: release
@@ -15,6 +19,18 @@ images:
1519
as:
1620
- registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.17-openshift-4.10
1721
to: file-integrity-operator
22+
operator:
23+
bundles:
24+
- as: file-integrity-operator-bundle
25+
base_index: operator-index
26+
context_dir: .
27+
dockerfile_path: bundle.Dockerfile
28+
update_graph: replaces
29+
substitutions:
30+
- pullspec: quay.io/file-integrity-operator/file-integrity-operator:0.1.28
31+
with: pipeline:file-integrity-operator
32+
- pullspec: quay.io/file-integrity-operator/file-integrity-operator:latest
33+
with: pipeline:file-integrity-operator
1834
promotion:
1935
name: "4.12"
2036
namespace: ocp
@@ -61,6 +77,53 @@ tests:
6177
requests:
6278
cpu: 100m
6379
workflow: ipi-aws
80+
- as: e2e-bundle-aws
81+
steps:
82+
cluster_profile: aws
83+
dependencies:
84+
OO_INDEX: ci-index-file-integrity-operator-bundle
85+
env:
86+
OO_CHANNEL: alpha
87+
OO_INSTALL_NAMESPACE: file-integrity
88+
OO_PACKAGE: file-integrity-operator
89+
OO_TARGET_NAMESPACES: '!install'
90+
test:
91+
- as: test-bundle
92+
cli: latest
93+
commands: TEST_BUNDLE_INSTALL=1 TEST_WATCH_NAMESPACE=file-integrity TEST_OPERATOR_NAMESPACE=file-integrity
94+
make e2e
95+
dependencies:
96+
- env: IMAGE_FROM_CI
97+
name: file-integrity-operator
98+
from: src
99+
resources:
100+
requests:
101+
cpu: 100m
102+
workflow: optional-operators-ci-aws
103+
- as: e2e-bundle-aws-upgrade
104+
steps:
105+
cluster_profile: aws
106+
dependencies:
107+
OO_INDEX: ci-index-file-integrity-operator-bundle
108+
env:
109+
OO_CHANNEL: alpha
110+
OO_INSTALL_NAMESPACE: file-integrity
111+
OO_LATEST_CSV: file-integrity-operator.v0.1.30
112+
OO_PACKAGE: file-integrity-operator
113+
OO_TARGET_NAMESPACES: '!install'
114+
test:
115+
- as: test-bundle-upgrade
116+
cli: latest
117+
commands: TEST_BUNDLE_INSTALL=1 TEST_WATCH_NAMESPACE=file-integrity TEST_OPERATOR_NAMESPACE=file-integrity
118+
make e2e
119+
dependencies:
120+
- env: IMAGE_FROM_CI
121+
name: file-integrity-operator
122+
from: src
123+
resources:
124+
requests:
125+
cpu: 100m
126+
workflow: optional-operators-ci-aws-upgrade
64127
zz_generated_metadata:
65128
branch: master
66129
org: openshift

‎ci-operator/jobs/openshift/file-integrity-operator/openshift-file-integrity-operator-master-presubmits.yaml

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,54 @@
11
presubmits:
22
openshift/file-integrity-operator:
3+
- agent: kubernetes
4+
always_run: true
5+
branches:
6+
- ^master$
7+
- ^master-
8+
cluster: build03
9+
context: ci/prow/ci-index-file-integrity-operator-bundle
10+
decorate: true
11+
decoration_config:
12+
skip_cloning: true
13+
labels:
14+
ci.openshift.io/generator: prowgen
15+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
16+
name: pull-ci-openshift-file-integrity-operator-master-ci-index-file-integrity-operator-bundle
17+
rerun_command: /test ci-index-file-integrity-operator-bundle
18+
spec:
19+
containers:
20+
- args:
21+
- --gcs-upload-secret=/secrets/gcs/service-account.json
22+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
23+
- --report-credentials-file=/etc/report/credentials
24+
- --target=ci-index-file-integrity-operator-bundle
25+
command:
26+
- ci-operator
27+
image: ci-operator:latest
28+
imagePullPolicy: Always
29+
name: ""
30+
resources:
31+
requests:
32+
cpu: 10m
33+
volumeMounts:
34+
- mountPath: /secrets/gcs
35+
name: gcs-credentials
36+
readOnly: true
37+
- mountPath: /etc/pull-secret
38+
name: pull-secret
39+
readOnly: true
40+
- mountPath: /etc/report
41+
name: result-aggregator
42+
readOnly: true
43+
serviceAccountName: ci-operator
44+
volumes:
45+
- name: pull-secret
46+
secret:
47+
secretName: registry-pull-credentials
48+
- name: result-aggregator
49+
secret:
50+
secretName: result-aggregator
51+
trigger: (?m)^/test( | .* )ci-index-file-integrity-operator-bundle,?($|\s.*)
352
- agent: kubernetes
453
always_run: true
554
branches:
@@ -74,6 +123,154 @@ presubmits:
74123
secret:
75124
secretName: result-aggregator
76125
trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
126+
- agent: kubernetes
127+
always_run: true
128+
branches:
129+
- ^master$
130+
- ^master-
131+
cluster: build03
132+
context: ci/prow/e2e-bundle-aws
133+
decorate: true
134+
decoration_config:
135+
skip_cloning: true
136+
labels:
137+
ci-operator.openshift.io/cloud: aws
138+
ci-operator.openshift.io/cloud-cluster-profile: aws
139+
ci.openshift.io/generator: prowgen
140+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
141+
name: pull-ci-openshift-file-integrity-operator-master-e2e-bundle-aws
142+
rerun_command: /test e2e-bundle-aws
143+
spec:
144+
containers:
145+
- args:
146+
- --gcs-upload-secret=/secrets/gcs/service-account.json
147+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
148+
- --lease-server-credentials-file=/etc/boskos/credentials
149+
- --report-credentials-file=/etc/report/credentials
150+
- --secret-dir=/secrets/ci-pull-credentials
151+
- --secret-dir=/usr/local/e2e-bundle-aws-cluster-profile
152+
- --target=e2e-bundle-aws
153+
command:
154+
- ci-operator
155+
image: ci-operator:latest
156+
imagePullPolicy: Always
157+
name: ""
158+
resources:
159+
requests:
160+
cpu: 10m
161+
volumeMounts:
162+
- mountPath: /etc/boskos
163+
name: boskos
164+
readOnly: true
165+
- mountPath: /secrets/ci-pull-credentials
166+
name: ci-pull-credentials
167+
readOnly: true
168+
- mountPath: /usr/local/e2e-bundle-aws-cluster-profile
169+
name: cluster-profile
170+
- mountPath: /secrets/gcs
171+
name: gcs-credentials
172+
readOnly: true
173+
- mountPath: /etc/pull-secret
174+
name: pull-secret
175+
readOnly: true
176+
- mountPath: /etc/report
177+
name: result-aggregator
178+
readOnly: true
179+
serviceAccountName: ci-operator
180+
volumes:
181+
- name: boskos
182+
secret:
183+
items:
184+
- key: credentials
185+
path: credentials
186+
secretName: boskos-credentials
187+
- name: ci-pull-credentials
188+
secret:
189+
secretName: ci-pull-credentials
190+
- name: cluster-profile
191+
secret:
192+
secretName: cluster-secrets-aws
193+
- name: pull-secret
194+
secret:
195+
secretName: registry-pull-credentials
196+
- name: result-aggregator
197+
secret:
198+
secretName: result-aggregator
199+
trigger: (?m)^/test( | .* )e2e-bundle-aws,?($|\s.*)
200+
- agent: kubernetes
201+
always_run: true
202+
branches:
203+
- ^master$
204+
- ^master-
205+
cluster: build03
206+
context: ci/prow/e2e-bundle-aws-upgrade
207+
decorate: true
208+
decoration_config:
209+
skip_cloning: true
210+
labels:
211+
ci-operator.openshift.io/cloud: aws
212+
ci-operator.openshift.io/cloud-cluster-profile: aws
213+
ci.openshift.io/generator: prowgen
214+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
215+
name: pull-ci-openshift-file-integrity-operator-master-e2e-bundle-aws-upgrade
216+
rerun_command: /test e2e-bundle-aws-upgrade
217+
spec:
218+
containers:
219+
- args:
220+
- --gcs-upload-secret=/secrets/gcs/service-account.json
221+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
222+
- --lease-server-credentials-file=/etc/boskos/credentials
223+
- --report-credentials-file=/etc/report/credentials
224+
- --secret-dir=/secrets/ci-pull-credentials
225+
- --secret-dir=/usr/local/e2e-bundle-aws-upgrade-cluster-profile
226+
- --target=e2e-bundle-aws-upgrade
227+
command:
228+
- ci-operator
229+
image: ci-operator:latest
230+
imagePullPolicy: Always
231+
name: ""
232+
resources:
233+
requests:
234+
cpu: 10m
235+
volumeMounts:
236+
- mountPath: /etc/boskos
237+
name: boskos
238+
readOnly: true
239+
- mountPath: /secrets/ci-pull-credentials
240+
name: ci-pull-credentials
241+
readOnly: true
242+
- mountPath: /usr/local/e2e-bundle-aws-upgrade-cluster-profile
243+
name: cluster-profile
244+
- mountPath: /secrets/gcs
245+
name: gcs-credentials
246+
readOnly: true
247+
- mountPath: /etc/pull-secret
248+
name: pull-secret
249+
readOnly: true
250+
- mountPath: /etc/report
251+
name: result-aggregator
252+
readOnly: true
253+
serviceAccountName: ci-operator
254+
volumes:
255+
- name: boskos
256+
secret:
257+
items:
258+
- key: credentials
259+
path: credentials
260+
secretName: boskos-credentials
261+
- name: ci-pull-credentials
262+
secret:
263+
secretName: ci-pull-credentials
264+
- name: cluster-profile
265+
secret:
266+
secretName: cluster-secrets-aws
267+
- name: pull-secret
268+
secret:
269+
secretName: registry-pull-credentials
270+
- name: result-aggregator
271+
secret:
272+
secretName: result-aggregator
273+
trigger: (?m)^/test( | .* )e2e-bundle-aws-upgrade,?($|\s.*)
77274
- agent: kubernetes
78275
always_run: true
79276
branches:

0 commit comments

Comments
 (0)