Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[zuul] Add 4.16 jobs #609

Merged
merged 17 commits into from
Jul 30, 2024
Merged

[zuul] Add 4.16 jobs #609

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
895c21c
[zuul] Add 4.16 jobs
elfiesmelfie Jul 5, 2024
a52d3ba
Add local_build variation
elfiesmelfie Jul 8, 2024
f9479aa
[zuul] Update OCP 4.16 nodeset to use biggest flavor
elfiesmelfie Jul 11, 2024
1a0f20a
Update the nodeset label for CRC 2.39
elfiesmelfie Jul 11, 2024
e0945e7
Update supported openshift versions to 4.16
elfiesmelfie Jul 11, 2024
5a9d440
fix typo
elfiesmelfie Jul 16, 2024
9fdd16a
[stf-collect-logs] Add oc get deployment to logs
elfiesmelfie Jul 17, 2024
a3285b5
[zuul] Update 4.16 node to use any cloud provider
elfiesmelfie Jul 17, 2024
506c26b
[zuul] Only run the nightly bundles job
elfiesmelfie Jul 17, 2024
35f4263
fix typo on stf-collect-logs
elfiesmelfie Jul 18, 2024
4b50640
Re-add vexxhost
elfiesmelfie Jul 18, 2024
4f9cdd5
[tmp] Check whether failures are due to the new OCP version
elfiesmelfie Jul 19, 2024
945b2ab
Update .zuul.yaml
csibbitt Jul 24, 2024
e379233
test all 4.16 jobs
elfiesmelfie Jul 26, 2024
7535760
Re-enable all 4.16 jobs and remove 4.12
elfiesmelfie Jul 26, 2024
21b7a46
Remove commented lines
elfiesmelfie Jul 26, 2024
f565915
Un-update stf-collectd-logs and update ci/README
elfiesmelfie Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 30 additions & 22 deletions .zuul.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
---
- nodeset:
name: stf-crc_extracted-ocp412
name: stf-crc_extracted-ocp414
nodes:
- name: controller
label: cloud-centos-9-stream-tripleo-vexxhost
- name: crc
label: coreos-crc-extracted-2-19-0-xxl
label: coreos-crc-extracted-2-30-0-xxl

- nodeset:
name: stf-crc_extracted-ocp414
name: stf-crc_extracted-ocp416
nodes:
- name: controller
label: cloud-centos-9-stream-tripleo-vexxhost
- name: crc
label: coreos-crc-extracted-2-30-0-xxl
label: coreos-crc-extracted-2-39-0-3xl

- job:
name: stf-base-2node
Expand Down Expand Up @@ -133,13 +133,6 @@
vars:
scenario: "nightly_bundles-index_deploy"

- job:
name: stf-crc-ocp_412-nightly_bundles
parent: stf-crc-nightly_bundles
description: |
Deploy STF using the nightly bundles on OCP 4.12
nodeset: stf-crc_extracted-ocp412

- job:
name: stf-crc-ocp_414-nightly_bundles
parent: stf-crc-nightly_bundles
Expand All @@ -148,11 +141,11 @@
nodeset: stf-crc_extracted-ocp414

- job:
name: stf-crc-ocp_412-local_build
parent: stf-crc-local_build
name: stf-crc-ocp_416-nightly_bundles
parent: stf-crc-nightly_bundles
description: |
Build images locally and deploy STF on OCP 4.12
nodeset: stf-crc_extracted-ocp412
Deploy STF using the nightly bundles on OCP 4.16
nodeset: stf-crc_extracted-ocp416

- job:
name: stf-crc-ocp_414-local_build
Expand All @@ -162,11 +155,11 @@
nodeset: stf-crc_extracted-ocp414

- job:
name: stf-crc-ocp_412-local_build-index_deploy
parent: stf-crc-local_build-index_deploy
name: stf-crc-ocp_416-local_build
parent: stf-crc-local_build
description: |
Build STF locally and deploy from index on OCP 4.12
nodeset: stf-crc_extracted-ocp412
Build STF locally and deploy from index on OCP 4.16
nodeset: stf-crc_extracted-ocp416

- job:
name: stf-crc-ocp_414-local_build-index_deploy
Expand All @@ -175,30 +168,45 @@
Build STF locally and deploy from index on OCP 4.14
nodeset: stf-crc_extracted-ocp414

- job:
name: stf-crc-ocp_416-local_build-index_deploy
parent: stf-crc-local_build-index_deploy
description: |
Build STF locally and deploy from index on OCP 4.16
nodeset: stf-crc_extracted-ocp416

- job:
name: stf-crc-ocp_414-nightly_bundles-index_deploy
parent: stf-crc-nightly_bundles-index_deploy
description: |
Create an index image using nightly bundles and deploy STF from it on OCP 4.14
nodeset: stf-crc_extracted-ocp414

- job:
name: stf-crc-ocp_416-nightly_bundles-index_deploy
parent: stf-crc-nightly_bundles-index_deploy
description: |
Create an index image using nightly bundles and deploy STF from it on OCP 4.16
nodeset: stf-crc_extracted-ocp416

- project-template:
name: stf-crc-jobs
description: |
STF CRC jobs that build and deploy STF
github-check:
jobs:
- stf-crc-ocp_412-local_build
- stf-crc-ocp_414-local_build
- stf-crc-ocp_412-local_build-index_deploy
- stf-crc-ocp_416-local_build
- stf-crc-ocp_414-local_build-index_deploy
- stf-crc-ocp_416-local_build-index_deploy
- stf-crc-ocp_414-nightly_bundles-index_deploy
- stf-crc-ocp_416-nightly_bundles-index_deploy

- project:
name: infrawatch/service-telemetry-operator
templates:
- stf-crc-jobs
periodic:
jobs:
- stf-crc-ocp_412-nightly_bundles
- stf-crc-ocp_414-nightly_bundles
- stf-crc-ocp_416-nightly_bundles
7 changes: 6 additions & 1 deletion build/stf-collect-logs/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,9 @@
oc -n {{ namespace }} logs $(oc -n {{ namespace }} get pod -l qdr -o jsonpath='{.items[].metadata.name}') >> {{ logfile_dir }}/logs_qdr.log 2>&1
ignore_errors: true
retries: 3
delay: 10
delay: 10

- name: Get deployments
ansible.builtin.shell:
cmd: |
oc -n {{ namespace }} get deployment -oyaml >> {{ logfile_dir }}/post_get_deployment.log
1 change: 0 additions & 1 deletion ci/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Two scenarios run:

Each of these scenarios run across the following OCP versions:
- 4.12
- 4.13
- 4.14
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we add 4.16 here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


### Periodic jobs
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm-catalog/service-telemetry-operator/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4
LABEL operators.operatorframework.io.metrics.project_layout=ansible
LABEL com.redhat.delivery.operator.bundle=true
LABEL com.redhat.openshift.versions="v4.12-v4.14"
LABEL com.redhat.openshift.versions="v4.12-v4.16"
LABEL com.redhat.delivery.backport=false

LABEL com.redhat.component="service-telemetry-operator-bundle-container" \
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
properties:
- type: olm.maxOpenShiftVersion
value: "4.14"
value: "4.16"
- type: olm.constraint
value:
failureMessage: Require Smart Gateway for Service Telemetry Framework
Expand Down