Skip to content

Commit 62a4aa4

Browse files
authored
Camel quarkus z-stream update and remove FIPS config (openshift#58571)
1 parent 98f93b6 commit 62a4aa4

File tree

3 files changed

+20
-130
lines changed

3 files changed

+20
-130
lines changed

ci-operator/config/jboss-fuse/camel-quarkus-openshift-interop/jboss-fuse-camel-quarkus-openshift-interop-main__camel-quarkus-ocp4.16-lp-interop.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ resources:
2727
memory: 200Mi
2828
tests:
2929
- as: camel-quarkus-interop-ibmcloud
30-
cron: 0 6 11 2 *
30+
cron: 0 6 25 12 *
3131
steps:
3232
cluster_profile: ibmcloud-cspi-qe
3333
env:

ci-operator/config/jboss-fuse/camel-quarkus-openshift-interop/jboss-fuse-camel-quarkus-openshift-interop-main__camel-quarkus-ocp4.17-lp-interop.yaml

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,24 @@ build_root:
1414
tag: golang-1.19
1515
releases:
1616
latest:
17-
candidate:
17+
prerelease:
1818
product: ocp
19-
stream: nightly
20-
version: "4.17"
19+
version_bounds:
20+
lower: 4.17.0-0
21+
stream: 4-stable
22+
upper: 4.18.0-0
2123
resources:
2224
'*':
2325
requests:
2426
cpu: 200m
2527
memory: 200Mi
2628
tests:
27-
- as: camel-quarkus-interop-aws
28-
cron: 0 6 11 2 *
29+
- as: camel-quarkus-interop-ibmcloud
30+
cron: 0 6 25 12 *
2931
steps:
30-
cluster_profile: aws-cspi-qe
32+
cluster_profile: ibmcloud-cspi-qe
3133
env:
32-
BASE_DOMAIN: cspilp.interop.ccitredhat.com
34+
BASE_DOMAIN: zstream.interop.ccitredhat.com
3335
FIREWATCH_CONFIG: |
3436
{
3537
"failure_rules":
@@ -38,37 +40,12 @@ tests:
3840
{"step": "quarkus-execute-tests", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "CEQ", "group": {"name": "lp-tests", "priority": 1}, "jira_component": ["Camel Quarkus"], "jira_additional_labels": ["!default","interop-tests"]}
3941
]
4042
}
41-
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
43+
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/ibm-ipi/lp-interop.json
4244
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.17-lp","self-managed-lp","camel-quarkus-lp"]'
4345
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
44-
USER_TAGS: |
45-
scenario camel-quarkus
4646
test:
4747
- ref: camel-quarkus-execute-tests
48-
workflow: firewatch-ipi-aws
49-
- as: camel-quarkus-interop-aws-fips
50-
cron: 0 6 11 2 *
51-
steps:
52-
cluster_profile: aws-cspi-qe
53-
env:
54-
BASE_DOMAIN: cspilp.interop.ccitredhat.com
55-
FIPS_ENABLED: "true"
56-
FIREWATCH_CONFIG: |
57-
{
58-
"failure_rules":
59-
[
60-
{"step": "quarkus-execute-tests", "failure_type": "pod_failure", "classification": "Test Execution", "group": {"name": "lp-tests", "priority": 1}, "jira_additional_labels": ["!default","interop-tests"]},
61-
{"step": "quarkus-execute-tests", "failure_type": "test_failure", "classification": "Test Failure", "jira_project": "CEQ", "group": {"name": "lp-tests", "priority": 1}, "jira_component": ["Camel Quarkus"], "jira_additional_labels": ["!default","interop-tests"]}
62-
]
63-
}
64-
FIREWATCH_CONFIG_FILE_PATH: https://raw.githubusercontent.com/CSPI-QE/cspi-utils/main/firewatch-base-configs/aws-ipi/lp-interop.json
65-
FIREWATCH_DEFAULT_JIRA_ADDITIONAL_LABELS: '["4.17-lp","self-managed-lp","camel-quarkus-lp","fips"]'
66-
FIREWATCH_DEFAULT_JIRA_PROJECT: LPINTEROP
67-
USER_TAGS: |
68-
scenario camel-quarkus
69-
test:
70-
- ref: camel-quarkus-execute-tests
71-
workflow: firewatch-ipi-aws
48+
workflow: firewatch-ipi-ibmcloud
7249
zz_generated_metadata:
7350
branch: main
7451
org: jboss-fuse

ci-operator/jobs/jboss-fuse/camel-quarkus-openshift-interop/jboss-fuse-camel-quarkus-openshift-interop-main-periodics.yaml

Lines changed: 8 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ periodics:
103103
name: periodic-ci-jboss-fuse-camel-quarkus-openshift-interop-main-camel-quarkus-ocp4.15-lp-interop-camel-quarkus-interop-ibmcloud
104104
reporter_config:
105105
slack:
106-
channel: '#camel-quarkus-qe'
106+
channel: '#team-camel-quarkus-qe'
107107
job_states_to_report:
108108
- success
109109
- failure
@@ -171,7 +171,7 @@ periodics:
171171
secretName: result-aggregator
172172
- agent: kubernetes
173173
cluster: build05
174-
cron: 0 6 11 2 *
174+
cron: 0 6 25 12 *
175175
decorate: true
176176
decoration_config:
177177
skip_cloning: true
@@ -188,7 +188,7 @@ periodics:
188188
name: periodic-ci-jboss-fuse-camel-quarkus-openshift-interop-main-camel-quarkus-ocp4.16-lp-interop-camel-quarkus-interop-ibmcloud
189189
reporter_config:
190190
slack:
191-
channel: '#camel-quarkus-qe'
191+
channel: '#team-camel-quarkus-qe'
192192
job_states_to_report:
193193
- success
194194
- failure
@@ -256,93 +256,7 @@ periodics:
256256
secretName: result-aggregator
257257
- agent: kubernetes
258258
cluster: build05
259-
cron: 0 6 11 2 *
260-
decorate: true
261-
decoration_config:
262-
skip_cloning: true
263-
extra_refs:
264-
- base_ref: main
265-
org: jboss-fuse
266-
repo: camel-quarkus-openshift-interop
267-
labels:
268-
ci-operator.openshift.io/cloud: aws
269-
ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
270-
ci-operator.openshift.io/variant: camel-quarkus-ocp4.17-lp-interop
271-
ci.openshift.io/generator: prowgen
272-
job-release: "4.17"
273-
pj-rehearse.openshift.io/can-be-rehearsed: "true"
274-
name: periodic-ci-jboss-fuse-camel-quarkus-openshift-interop-main-camel-quarkus-ocp4.17-lp-interop-camel-quarkus-interop-aws
275-
reporter_config:
276-
slack:
277-
channel: '#team-camel-quarkus-qe'
278-
job_states_to_report:
279-
- success
280-
- failure
281-
- error
282-
report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}*
283-
ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed:
284-
Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View
285-
logs> {{end}}'
286-
spec:
287-
containers:
288-
- args:
289-
- --gcs-upload-secret=/secrets/gcs/service-account.json
290-
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
291-
- --lease-server-credentials-file=/etc/boskos/credentials
292-
- --report-credentials-file=/etc/report/credentials
293-
- --secret-dir=/secrets/ci-pull-credentials
294-
- --target=camel-quarkus-interop-aws
295-
- --variant=camel-quarkus-ocp4.17-lp-interop
296-
command:
297-
- ci-operator
298-
image: ci-operator:latest
299-
imagePullPolicy: Always
300-
name: ""
301-
resources:
302-
requests:
303-
cpu: 10m
304-
volumeMounts:
305-
- mountPath: /etc/boskos
306-
name: boskos
307-
readOnly: true
308-
- mountPath: /secrets/ci-pull-credentials
309-
name: ci-pull-credentials
310-
readOnly: true
311-
- mountPath: /secrets/gcs
312-
name: gcs-credentials
313-
readOnly: true
314-
- mountPath: /secrets/manifest-tool
315-
name: manifest-tool-local-pusher
316-
readOnly: true
317-
- mountPath: /etc/pull-secret
318-
name: pull-secret
319-
readOnly: true
320-
- mountPath: /etc/report
321-
name: result-aggregator
322-
readOnly: true
323-
serviceAccountName: ci-operator
324-
volumes:
325-
- name: boskos
326-
secret:
327-
items:
328-
- key: credentials
329-
path: credentials
330-
secretName: boskos-credentials
331-
- name: ci-pull-credentials
332-
secret:
333-
secretName: ci-pull-credentials
334-
- name: manifest-tool-local-pusher
335-
secret:
336-
secretName: manifest-tool-local-pusher
337-
- name: pull-secret
338-
secret:
339-
secretName: registry-pull-credentials
340-
- name: result-aggregator
341-
secret:
342-
secretName: result-aggregator
343-
- agent: kubernetes
344-
cluster: build05
345-
cron: 0 6 11 2 *
259+
cron: 0 6 25 12 *
346260
decorate: true
347261
decoration_config:
348262
skip_cloning: true
@@ -351,13 +265,12 @@ periodics:
351265
org: jboss-fuse
352266
repo: camel-quarkus-openshift-interop
353267
labels:
354-
ci-operator.openshift.io/cloud: aws
355-
ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
268+
ci-operator.openshift.io/cloud: ibmcloud
269+
ci-operator.openshift.io/cloud-cluster-profile: ibmcloud-cspi-qe
356270
ci-operator.openshift.io/variant: camel-quarkus-ocp4.17-lp-interop
357271
ci.openshift.io/generator: prowgen
358-
job-release: "4.17"
359272
pj-rehearse.openshift.io/can-be-rehearsed: "true"
360-
name: periodic-ci-jboss-fuse-camel-quarkus-openshift-interop-main-camel-quarkus-ocp4.17-lp-interop-camel-quarkus-interop-aws-fips
273+
name: periodic-ci-jboss-fuse-camel-quarkus-openshift-interop-main-camel-quarkus-ocp4.17-lp-interop-camel-quarkus-interop-ibmcloud
361274
reporter_config:
362275
slack:
363276
channel: '#team-camel-quarkus-qe'
@@ -377,7 +290,7 @@ periodics:
377290
- --lease-server-credentials-file=/etc/boskos/credentials
378291
- --report-credentials-file=/etc/report/credentials
379292
- --secret-dir=/secrets/ci-pull-credentials
380-
- --target=camel-quarkus-interop-aws-fips
293+
- --target=camel-quarkus-interop-ibmcloud
381294
- --variant=camel-quarkus-ocp4.17-lp-interop
382295
command:
383296
- ci-operator

0 commit comments

Comments
 (0)