From 895c21c9336cb299b82c7bb0babf0fa6600a3be6 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 5 Jul 2024 17:22:00 +0100 Subject: [PATCH 01/17] [zuul] Add 4.16 jobs --- .zuul.yaml | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 935ed468..35a3d77e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -15,6 +15,14 @@ - name: crc label: coreos-crc-extracted-2-30-0-xxl +- nodeset: + name: stf-crc_extracted-ocp416 + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: crc-cloud-ocp-4-16-0-rc4-3xl + - job: name: stf-base-2node parent: podified-multinode-edpm-deployment-crc @@ -147,6 +155,13 @@ Deploy STF using the nightly bundles on OCP 4.14 nodeset: stf-crc_extracted-ocp414 +- job: + name: stf-crc-ocp_416-nightly_bundles + parent: stf-crc-nightly_bundles + description: | + Deploy STF using the nightly bundles on OCP 4.16 + nodeset: stf-crc_extracted-ocp416 + - job: name: stf-crc-ocp_412-local_build parent: stf-crc-local_build @@ -175,6 +190,13 @@ 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 @@ -182,17 +204,27 @@ 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_41i6-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_414-local_build-index_deploy - - stf-crc-ocp_414-nightly_bundles-index_deploy + #- stf-crc-ocp_412-local_build + #- stf-crc-ocp_414-local_build + #- stf-crc-ocp_412-local_build-index_deploy + #- 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 + - stf-crc-ocp_416-nightly_bundles - project: name: infrawatch/service-telemetry-operator From a52d3ba2f58484506e87a49b9350eb3ef82d8770 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 8 Jul 2024 16:44:40 +0100 Subject: [PATCH 02/17] Add local_build variation --- .zuul.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 35a3d77e..4a13765e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -176,6 +176,13 @@ Build images locally and deploy STF on OCP 4.14 nodeset: stf-crc_extracted-ocp414 +- job: + name: stf-crc-ocp_416-local_build + parent: stf-crc-local_build + description: | + Build STF locally and deploy from index on OCP 4.16 + nodeset: stf-crc_extracted-ocp416 + - job: name: stf-crc-ocp_412-local_build-index_deploy parent: stf-crc-local_build-index_deploy @@ -219,6 +226,7 @@ jobs: #- stf-crc-ocp_412-local_build #- stf-crc-ocp_414-local_build + - stf-crc-ocp_416-local_build #- stf-crc-ocp_412-local_build-index_deploy #- stf-crc-ocp_414-local_build-index_deploy - stf-crc-ocp_416-local_build-index_deploy From f9479aa45f90f6bc79a8fa2d1486fc3f06b2d3e9 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Thu, 11 Jul 2024 11:08:13 +0100 Subject: [PATCH 03/17] [zuul] Update OCP 4.16 nodeset to use biggest flavor This is to see if sg-core just needs more resource to build. Eventually, the size will be reduced again to not-the-largest-available. --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 4a13765e..cd14c00f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -21,7 +21,7 @@ - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: crc-cloud-ocp-4-16-0-rc4-3xl + label: crc-cloud-ocp-4-16-0-rc4-6xl - job: name: stf-base-2node From 1a0f20ac93f65407aaec0e88fd7a8f8ea0dc9f8f Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Thu, 11 Jul 2024 14:15:09 +0100 Subject: [PATCH 04/17] Update the nodeset label for CRC 2.39 --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index cd14c00f..8f4fd34c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -21,7 +21,7 @@ - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: crc-cloud-ocp-4-16-0-rc4-6xl + label: coreos-crc-extracted-2-39-0-3xl - job: name: stf-base-2node From e0945e7a890db7daf47b71b60f728516d33b499a Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Thu, 11 Jul 2024 18:02:03 +0100 Subject: [PATCH 05/17] Update supported openshift versions to 4.16 --- ci/README.md | 1 - deploy/olm-catalog/service-telemetry-operator/Dockerfile.in | 2 +- .../service-telemetry-operator/metadata/properties.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/README.md b/ci/README.md index 93e9e60f..6b4589fa 100644 --- a/ci/README.md +++ b/ci/README.md @@ -15,7 +15,6 @@ Two scenarios run: Each of these scenarios run across the following OCP versions: - 4.12 -- 4.13 - 4.14 ### Periodic jobs diff --git a/deploy/olm-catalog/service-telemetry-operator/Dockerfile.in b/deploy/olm-catalog/service-telemetry-operator/Dockerfile.in index 871edc3c..9fd49e86 100644 --- a/deploy/olm-catalog/service-telemetry-operator/Dockerfile.in +++ b/deploy/olm-catalog/service-telemetry-operator/Dockerfile.in @@ -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" \ diff --git a/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml b/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml index 5ffce525..7dd691a0 100644 --- a/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml +++ b/deploy/olm-catalog/service-telemetry-operator/metadata/properties.yaml @@ -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 From 5a9d44005613e9067f9456f7aa9d901d51a9d8af Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 16 Jul 2024 16:23:53 +0100 Subject: [PATCH 06/17] fix typo --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8f4fd34c..0908d31e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -212,7 +212,7 @@ nodeset: stf-crc_extracted-ocp414 - job: - name: stf-crc-ocp_41i6-nightly_bundles-index_deploy + 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 From 9fdd16a626f0ec32d2db66b09b0d750a8cd23481 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 17 Jul 2024 18:38:57 +0100 Subject: [PATCH 07/17] [stf-collect-logs] Add oc get deployment to logs --- build/stf-collect-logs/tasks/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build/stf-collect-logs/tasks/main.yml b/build/stf-collect-logs/tasks/main.yml index 347d07f3..9694ca14 100644 --- a/build/stf-collect-logs/tasks/main.yml +++ b/build/stf-collect-logs/tasks/main.yml @@ -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 \ No newline at end of file + delay: 10 + +- name: Get deployments + ansible.builtin.shell: + cmd: | + oc -n {{ namespace }}get deployment -oyaml >> {{ logfile_dir }}/post_get_deployment.log From a3285b50bb531cf5b77b4d03d3f977fdefcbe7ad Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 17 Jul 2024 18:39:48 +0100 Subject: [PATCH 08/17] [zuul] Update 4.16 node to use any cloud provider --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 0908d31e..0aa26b0b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -19,7 +19,7 @@ name: stf-crc_extracted-ocp416 nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-39-0-3xl From 506c26b94233a676c15869746c68deb42009212e Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 17 Jul 2024 18:41:00 +0100 Subject: [PATCH 09/17] [zuul] Only run the nightly bundles job All the jobs are currently failing for the same reason, disable all but the fastest one to save resources --- .zuul.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 0aa26b0b..520b4efd 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -226,12 +226,12 @@ jobs: #- stf-crc-ocp_412-local_build #- stf-crc-ocp_414-local_build - - stf-crc-ocp_416-local_build + #- stf-crc-ocp_416-local_build #- stf-crc-ocp_412-local_build-index_deploy #- stf-crc-ocp_414-local_build-index_deploy - - stf-crc-ocp_416-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 + #- stf-crc-ocp_416-nightly_bundles-index_deploy - stf-crc-ocp_416-nightly_bundles - project: From 35f4263f77121ef9f5e16a0c2d839acb35049c23 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Thu, 18 Jul 2024 14:37:05 +0100 Subject: [PATCH 10/17] fix typo on stf-collect-logs --- build/stf-collect-logs/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/stf-collect-logs/tasks/main.yml b/build/stf-collect-logs/tasks/main.yml index 9694ca14..d612ed54 100644 --- a/build/stf-collect-logs/tasks/main.yml +++ b/build/stf-collect-logs/tasks/main.yml @@ -82,4 +82,4 @@ - name: Get deployments ansible.builtin.shell: cmd: | - oc -n {{ namespace }}get deployment -oyaml >> {{ logfile_dir }}/post_get_deployment.log + oc -n {{ namespace }} get deployment -oyaml >> {{ logfile_dir }}/post_get_deployment.log From 4b5064035a79eb7bcdb0c93549d9b8314f7ceb2c Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Thu, 18 Jul 2024 16:14:35 +0100 Subject: [PATCH 11/17] Re-add vexxhost --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 520b4efd..f7ea9055 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -19,7 +19,7 @@ name: stf-crc_extracted-ocp416 nodes: - name: controller - label: cloud-centos-9-stream-tripleo + label: cloud-centos-9-stream-tripleo-vexxhost - name: crc label: coreos-crc-extracted-2-39-0-3xl From 4f9cdd5078555293526ac4dc84615e3c261809da Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 19 Jul 2024 13:05:03 +0100 Subject: [PATCH 12/17] [tmp] Check whether failures are due to the new OCP version --- .zuul.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.zuul.yaml b/.zuul.yaml index f7ea9055..3d92f653 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -232,6 +232,7 @@ #- stf-crc-ocp_416-local_build-index_deploy #- stf-crc-ocp_414-nightly_bundles-index_deploy #- stf-crc-ocp_416-nightly_bundles-index_deploy + - stf-crc-ocp_414-nightly_bundles - stf-crc-ocp_416-nightly_bundles - project: From 945b2ab7dc5c4bc73274c9991aa74a7d068a88a8 Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Wed, 24 Jul 2024 12:41:22 -0400 Subject: [PATCH 13/17] Update .zuul.yaml Switching from nightly bundles to local builds in order to test 4.16 fixes --- .zuul.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 3d92f653..8aa7c1ca 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -225,15 +225,15 @@ github-check: jobs: #- stf-crc-ocp_412-local_build - #- stf-crc-ocp_414-local_build - #- stf-crc-ocp_416-local_build + - stf-crc-ocp_414-local_build + - stf-crc-ocp_416-local_build #- stf-crc-ocp_412-local_build-index_deploy #- 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 - - stf-crc-ocp_414-nightly_bundles - - stf-crc-ocp_416-nightly_bundles + #- stf-crc-ocp_414-nightly_bundles + #- stf-crc-ocp_416-nightly_bundles - project: name: infrawatch/service-telemetry-operator From e3792337d99f37fb61c76bbed62ca6041bc823fb Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 26 Jul 2024 15:06:42 +0100 Subject: [PATCH 14/17] test all 4.16 jobs --- .zuul.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8aa7c1ca..990aa002 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -225,15 +225,15 @@ github-check: jobs: #- stf-crc-ocp_412-local_build - - stf-crc-ocp_414-local_build + #- stf-crc-ocp_414-local_build - stf-crc-ocp_416-local_build #- stf-crc-ocp_412-local_build-index_deploy #- stf-crc-ocp_414-local_build-index_deploy - #- stf-crc-ocp_416-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 + - stf-crc-ocp_416-nightly_bundles-index_deploy #- stf-crc-ocp_414-nightly_bundles - #- stf-crc-ocp_416-nightly_bundles + - stf-crc-ocp_416-nightly_bundles - project: name: infrawatch/service-telemetry-operator @@ -243,3 +243,4 @@ jobs: - stf-crc-ocp_412-nightly_bundles - stf-crc-ocp_414-nightly_bundles + - stf-crc-ocp_416-nightly_bundles From 753576083bf70549d6bf8111ab9ee2f3352edd03 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 26 Jul 2024 17:21:11 +0100 Subject: [PATCH 15/17] Re-enable all 4.16 jobs and remove 4.12 --- .zuul.yaml | 46 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 990aa002..0a3e98bc 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,11 +1,11 @@ --- -- nodeset: - name: stf-crc_extracted-ocp412 - nodes: - - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost - - name: crc - label: coreos-crc-extracted-2-19-0-xxl +#- nodeset: +# name: stf-crc_extracted-ocp412 +# nodes: +# - name: controller +# label: cloud-centos-9-stream-tripleo-vexxhost +# - name: crc +# label: coreos-crc-extracted-2-19-0-xxl - nodeset: name: stf-crc_extracted-ocp414 @@ -141,13 +141,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 @@ -162,13 +155,6 @@ Deploy STF using the nightly bundles on OCP 4.16 nodeset: stf-crc_extracted-ocp416 -- job: - name: stf-crc-ocp_412-local_build - parent: stf-crc-local_build - description: | - Build images locally and deploy STF on OCP 4.12 - nodeset: stf-crc_extracted-ocp412 - - job: name: stf-crc-ocp_414-local_build parent: stf-crc-local_build @@ -183,13 +169,6 @@ Build STF locally and deploy from index on OCP 4.16 nodeset: stf-crc_extracted-ocp416 -- job: - name: stf-crc-ocp_412-local_build-index_deploy - parent: stf-crc-local_build-index_deploy - description: | - Build STF locally and deploy from index on OCP 4.12 - nodeset: stf-crc_extracted-ocp412 - - job: name: stf-crc-ocp_414-local_build-index_deploy parent: stf-crc-local_build-index_deploy @@ -224,16 +203,12 @@ 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_414-local_build - stf-crc-ocp_416-local_build - #- stf-crc-ocp_412-local_build-index_deploy - #- stf-crc-ocp_414-local_build-index_deploy + - 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_414-nightly_bundles-index_deploy - stf-crc-ocp_416-nightly_bundles-index_deploy - #- stf-crc-ocp_414-nightly_bundles - - stf-crc-ocp_416-nightly_bundles - project: name: infrawatch/service-telemetry-operator @@ -241,6 +216,5 @@ - stf-crc-jobs periodic: jobs: - - stf-crc-ocp_412-nightly_bundles - stf-crc-ocp_414-nightly_bundles - stf-crc-ocp_416-nightly_bundles From 21b7a46bddd4cf718d7610e7644a5cc7e3110d7a Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 26 Jul 2024 19:25:02 +0100 Subject: [PATCH 16/17] Remove commented lines --- .zuul.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 0a3e98bc..10a508ac 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,12 +1,4 @@ --- -#- nodeset: -# name: stf-crc_extracted-ocp412 -# nodes: -# - name: controller -# label: cloud-centos-9-stream-tripleo-vexxhost -# - name: crc -# label: coreos-crc-extracted-2-19-0-xxl - - nodeset: name: stf-crc_extracted-ocp414 nodes: From f565915d7808216c9503c84b6d718f119e36e0ad Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 29 Jul 2024 16:47:06 +0100 Subject: [PATCH 17/17] Un-update stf-collectd-logs and update ci/README --- build/stf-collect-logs/tasks/main.yml | 7 +------ ci/README.md | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build/stf-collect-logs/tasks/main.yml b/build/stf-collect-logs/tasks/main.yml index d612ed54..347d07f3 100644 --- a/build/stf-collect-logs/tasks/main.yml +++ b/build/stf-collect-logs/tasks/main.yml @@ -77,9 +77,4 @@ 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 - -- name: Get deployments - ansible.builtin.shell: - cmd: | - oc -n {{ namespace }} get deployment -oyaml >> {{ logfile_dir }}/post_get_deployment.log + delay: 10 \ No newline at end of file diff --git a/ci/README.md b/ci/README.md index 6b4589fa..2c559f01 100644 --- a/ci/README.md +++ b/ci/README.md @@ -14,8 +14,8 @@ Two scenarios run: - `local_build-index_deploy`, which builds the images and does an index-based deployment Each of these scenarios run across the following OCP versions: -- 4.12 - 4.14 +- 4.16 ### Periodic jobs