From 4cc390aebe6f837ba34c45aac6d1966061d3bbb1 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 28 May 2024 11:26:52 -0400 Subject: [PATCH 01/12] [zuul] Give OCP 4.12 jobs more resources --- .zuul.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index f81d81ff..5ab95e8b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -5,7 +5,7 @@ - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: coreos-crc-extracted-2-19-0-xxl + label: coreos-crc-extracted-2-19-0-3xl - nodeset: name: stf-crc_extracted-ocp414 @@ -173,9 +173,9 @@ github-check: jobs: - stf-crc-ocp_412-local_build - - stf-crc-ocp_414-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-local_build-index_deploy - project: name: infrawatch/service-telemetry-operator From c528009ee6dab3659249bc49c9618a8bf89b7466 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 28 May 2024 11:32:11 -0400 Subject: [PATCH 02/12] [zuul] Add new nodeset for OCP4.12 Editing the existing nodeset caused an error because the nodeset definition on master was different. --- .zuul.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 5ab95e8b..c6cdfec3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,6 +1,14 @@ --- - 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-new nodes: - name: controller label: cloud-centos-9-stream-tripleo-vexxhost From 2e93b0d7eae41cd061a5d7120f75293c575fdf11 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 29 May 2024 09:14:08 -0400 Subject: [PATCH 03/12] Add multiple 412 jobs with different nodesets --- .zuul.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c6cdfec3..310730a8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -181,9 +181,9 @@ github-check: jobs: - stf-crc-ocp_412-local_build - #- stf-crc-ocp_414-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-local_build-index_deploy - project: name: infrawatch/service-telemetry-operator From dadc358adccf4dcce6297aaf1dd7b0f4439de32d Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 31 May 2024 08:05:33 -0400 Subject: [PATCH 04/12] [zuul] Add temp jobs to test bigger nodesets --- .zuul.yaml | 110 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 100 insertions(+), 10 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 310730a8..3eb25b3e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -7,14 +7,6 @@ - name: crc label: coreos-crc-extracted-2-19-0-xxl -- nodeset: - name: stf-crc_extracted-ocp412-new - nodes: - - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost - - name: crc - label: coreos-crc-extracted-2-19-0-3xl - - nodeset: name: stf-crc_extracted-ocp414 nodes: @@ -174,6 +166,92 @@ Build STF locally and deploy from index on OCP 4.14 nodeset: stf-crc_extracted-ocp414 +# ########## +# Test jobs +# ########## +# Local_build +# +- job: + name: stf-crc-ocp_412-local_build-3xl + parent: stf-crc-ocp_412-local_build + nodeset: + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: coreos-crc-extracted-2-19-0-3xl + +- job: + name: stf-crc-ocp_412-local_build-4xlarge + parent: stf-crc-ocp_412-local_build + nodeset: + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: coreos-crc-extracted-2-19-0-4xlarge + +- job: + name: stf-crc-ocp_412-local_build-5xlarge + parent: stf-crc-ocp_412-local_build + nodeset: + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: coreos-crc-extracted-2-19-0-5xlarge + +- job: + name: stf-crc-ocp_412-local_build-6xlarge + parent: stf-crc-ocp_412-local_build + nodeset: + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: coreos-crc-extracted-2-19-0-6xlarge + +# local_build-index_deploy +- job: + name: stf-crc-ocp_412-local_build-index_deploy-3xl + parent: stf-crc-ocp_412-local_build-index_deploy + nodeset: + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: coreos-crc-extracted-2-19-0-3xl + +- job: + name: stf-crc-ocp_412-local_build-index_deploy-4xlarge + parent: stf-crc-ocp_412-local_build-index_deploy + nodeset: + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: coreos-crc-extracted-2-19-0-4xlarge + +- job: + name: stf-crc-ocp_412-local_build-index_deploy-5xlarge + parent: stf-crc-ocp_412-local_build-index_deploy + nodeset: + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: coreos-crc-extracted-2-19-0-5xlarge + +- job: + name: stf-crc-ocp_412-local_build-index_deploy-6xlarge + parent: stf-crc-ocp_412-local_build-index_deploy + nodeset: + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: coreos-crc-extracted-2-19-0-6xlarge + - project-template: name: stf-crc-jobs description: | @@ -187,9 +265,21 @@ - project: name: infrawatch/service-telemetry-operator - templates: - - stf-crc-jobs + #templates: + # - stf-crc-jobs periodic: jobs: - stf-crc-ocp_412-nightly_bundles - stf-crc-ocp_414-nightly_bundles + github-check: + jobs: + - stf-crc-ocp_412-local_build + - stf-crc-ocp_412-local_build-3xl + - stf-crc-ocp_412-local_build-4xlarge + - stf-crc-ocp_412-local_build-5xlarge + - stf-crc-ocp_412-local_build-6xlarge + - stf-crc-ocp_412-local_build-index_deploy + - stf-crc-ocp_412-local_build-index_deploy-3xl + - stf-crc-ocp_412-local_build-index_deploy-4xlarge + - stf-crc-ocp_412-local_build-index_deploy-5xlarge + - stf-crc-ocp_412-local_build-index_deploy-6xlarge From 329818fa9f23f1d1b980176f5daddd24b5d53851 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 31 May 2024 08:39:14 -0400 Subject: [PATCH 05/12] enable debug on github-check pipeline --- .zuul.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.zuul.yaml b/.zuul.yaml index 3eb25b3e..6db17a1e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -272,6 +272,7 @@ - stf-crc-ocp_412-nightly_bundles - stf-crc-ocp_414-nightly_bundles github-check: + debug: true jobs: - stf-crc-ocp_412-local_build - stf-crc-ocp_412-local_build-3xl From 41fa81038cc7bc483472a6914274439bd0f86012 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 31 May 2024 08:57:22 -0400 Subject: [PATCH 06/12] update jobs in the pipeline --- .zuul.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 6db17a1e..6d71ebe1 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -276,11 +276,11 @@ jobs: - stf-crc-ocp_412-local_build - stf-crc-ocp_412-local_build-3xl - - stf-crc-ocp_412-local_build-4xlarge - - stf-crc-ocp_412-local_build-5xlarge - - stf-crc-ocp_412-local_build-6xlarge + #- stf-crc-ocp_412-local_build-4xlarge + #- stf-crc-ocp_412-local_build-5xlarge + #- stf-crc-ocp_412-local_build-6xlarge - stf-crc-ocp_412-local_build-index_deploy - stf-crc-ocp_412-local_build-index_deploy-3xl - - stf-crc-ocp_412-local_build-index_deploy-4xlarge - - stf-crc-ocp_412-local_build-index_deploy-5xlarge - - stf-crc-ocp_412-local_build-index_deploy-6xlarge + #- stf-crc-ocp_412-local_build-index_deploy-4xlarge + #- stf-crc-ocp_412-local_build-index_deploy-5xlarge + #- stf-crc-ocp_412-local_build-index_deploy-6xlarge From 79113d93a848d6b2e5d4acb6916fc7a0e59358c1 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 31 May 2024 12:42:02 -0400 Subject: [PATCH 07/12] unset debug for github-check pipeline --- .zuul.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 6d71ebe1..14aaf5cd 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -272,7 +272,6 @@ - stf-crc-ocp_412-nightly_bundles - stf-crc-ocp_414-nightly_bundles github-check: - debug: true jobs: - stf-crc-ocp_412-local_build - stf-crc-ocp_412-local_build-3xl From 2be837b0186e46f6655db936f9a148750286e391 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 31 May 2024 13:09:54 -0400 Subject: [PATCH 08/12] Update the nodeset labels They should now match the labels added in https://softwarefactory-project.io/r/c/config/+/31596 --- .zuul.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 14aaf5cd..05743651 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -182,24 +182,24 @@ label: coreos-crc-extracted-2-19-0-3xl - job: - name: stf-crc-ocp_412-local_build-4xlarge + name: stf-crc-ocp_412-local_build-4xl parent: stf-crc-ocp_412-local_build nodeset: nodes: - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: coreos-crc-extracted-2-19-0-4xlarge + label: coreos-crc-extracted-2-19-0-4xl - job: - name: stf-crc-ocp_412-local_build-5xlarge + name: stf-crc-ocp_412-local_build-5xl parent: stf-crc-ocp_412-local_build nodeset: nodes: - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: coreos-crc-extracted-2-19-0-5xlarge + label: coreos-crc-extracted-2-19-0-5xl - job: name: stf-crc-ocp_412-local_build-6xlarge @@ -230,7 +230,7 @@ - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: coreos-crc-extracted-2-19-0-4xlarge + label: coreos-crc-extracted-2-19-0-4xl - job: name: stf-crc-ocp_412-local_build-index_deploy-5xlarge @@ -240,7 +240,7 @@ - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: coreos-crc-extracted-2-19-0-5xlarge + label: coreos-crc-extracted-2-19-0-5xl - job: name: stf-crc-ocp_412-local_build-index_deploy-6xlarge @@ -250,7 +250,7 @@ - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: coreos-crc-extracted-2-19-0-6xlarge + label: coreos-crc-extracted-2-19-0-6xl - project-template: name: stf-crc-jobs @@ -275,11 +275,11 @@ jobs: - stf-crc-ocp_412-local_build - stf-crc-ocp_412-local_build-3xl - #- stf-crc-ocp_412-local_build-4xlarge - #- stf-crc-ocp_412-local_build-5xlarge - #- stf-crc-ocp_412-local_build-6xlarge + #- stf-crc-ocp_412-local_build-4xl + #- stf-crc-ocp_412-local_build-5xl + #- stf-crc-ocp_412-local_build-6xl - stf-crc-ocp_412-local_build-index_deploy - stf-crc-ocp_412-local_build-index_deploy-3xl - #- stf-crc-ocp_412-local_build-index_deploy-4xlarge - #- stf-crc-ocp_412-local_build-index_deploy-5xlarge - #- stf-crc-ocp_412-local_build-index_deploy-6xlarge + #- stf-crc-ocp_412-local_build-index_deploy-4xl + #- stf-crc-ocp_412-local_build-index_deploy-5xl + #- stf-crc-ocp_412-local_build-index_deploy-6xl From 09d5eeac912f429314bd76a702d418221970445f Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 3 Jun 2024 14:45:29 +0100 Subject: [PATCH 09/12] Update .zuul.yaml --- .zuul.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 05743651..4fe49896 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -275,11 +275,11 @@ jobs: - stf-crc-ocp_412-local_build - stf-crc-ocp_412-local_build-3xl - #- stf-crc-ocp_412-local_build-4xl - #- stf-crc-ocp_412-local_build-5xl - #- stf-crc-ocp_412-local_build-6xl + - stf-crc-ocp_412-local_build-4xl + - stf-crc-ocp_412-local_build-5xl + - stf-crc-ocp_412-local_build-6xl - stf-crc-ocp_412-local_build-index_deploy - stf-crc-ocp_412-local_build-index_deploy-3xl - #- stf-crc-ocp_412-local_build-index_deploy-4xl - #- stf-crc-ocp_412-local_build-index_deploy-5xl - #- stf-crc-ocp_412-local_build-index_deploy-6xl + - stf-crc-ocp_412-local_build-index_deploy-4xl + - stf-crc-ocp_412-local_build-index_deploy-5xl + - stf-crc-ocp_412-local_build-index_deploy-6xl From 0878bece8d208bbc1c1e3d87e333be8cd197c843 Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Mon, 3 Jun 2024 10:48:43 -0400 Subject: [PATCH 10/12] Update .zuul.yaml --- .zuul.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 4fe49896..8d3d02c5 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -202,14 +202,14 @@ label: coreos-crc-extracted-2-19-0-5xl - job: - name: stf-crc-ocp_412-local_build-6xlarge + name: stf-crc-ocp_412-local_build-6xl parent: stf-crc-ocp_412-local_build nodeset: nodes: - name: controller label: cloud-centos-9-stream-tripleo-vexxhost - name: crc - label: coreos-crc-extracted-2-19-0-6xlarge + label: coreos-crc-extracted-2-19-0-6xl # local_build-index_deploy - job: @@ -223,7 +223,7 @@ label: coreos-crc-extracted-2-19-0-3xl - job: - name: stf-crc-ocp_412-local_build-index_deploy-4xlarge + name: stf-crc-ocp_412-local_build-index_deploy-4xl parent: stf-crc-ocp_412-local_build-index_deploy nodeset: nodes: @@ -233,7 +233,7 @@ label: coreos-crc-extracted-2-19-0-4xl - job: - name: stf-crc-ocp_412-local_build-index_deploy-5xlarge + name: stf-crc-ocp_412-local_build-index_deploy-5xl parent: stf-crc-ocp_412-local_build-index_deploy nodeset: nodes: @@ -243,7 +243,7 @@ label: coreos-crc-extracted-2-19-0-5xl - job: - name: stf-crc-ocp_412-local_build-index_deploy-6xlarge + name: stf-crc-ocp_412-local_build-index_deploy-6xl parent: stf-crc-ocp_412-local_build-index_deploy nodeset: nodes: From 2b05669390d35c45ca31a666e371d46e8fee73b7 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 5 Jun 2024 07:38:12 -0400 Subject: [PATCH 11/12] [zuul] Update controller node to a more generic label --- .zuul.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8d3d02c5..8cc7a1ef 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -177,7 +177,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-19-0-3xl @@ -187,7 +187,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-19-0-4xl @@ -197,7 +197,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-19-0-5xl @@ -207,7 +207,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-19-0-6xl @@ -218,7 +218,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-19-0-3xl @@ -228,7 +228,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-19-0-4xl @@ -238,7 +238,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-19-0-5xl @@ -248,7 +248,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo-vexxhost + label: cloud-centos-9-stream-tripleo - name: crc label: coreos-crc-extracted-2-19-0-6xl From e091546e1732ff770a354c3a4dd4fccb776f07c9 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 5 Jun 2024 08:24:21 -0400 Subject: [PATCH 12/12] disable the larger job varients to test updates for centos8s repos * Update label for node used as controller --- .zuul.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8cc7a1ef..f4aa0f2f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -218,7 +218,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo + label: cloud-centos-9-stream - name: crc label: coreos-crc-extracted-2-19-0-3xl @@ -228,7 +228,7 @@ nodeset: nodes: - name: controller - label: cloud-centos-9-stream-tripleo + label: cloud-centos-9-stream - name: crc label: coreos-crc-extracted-2-19-0-4xl @@ -276,10 +276,10 @@ - stf-crc-ocp_412-local_build - stf-crc-ocp_412-local_build-3xl - stf-crc-ocp_412-local_build-4xl - - stf-crc-ocp_412-local_build-5xl - - stf-crc-ocp_412-local_build-6xl + #- stf-crc-ocp_412-local_build-5xl + #- stf-crc-ocp_412-local_build-6xl - stf-crc-ocp_412-local_build-index_deploy - stf-crc-ocp_412-local_build-index_deploy-3xl - stf-crc-ocp_412-local_build-index_deploy-4xl - - stf-crc-ocp_412-local_build-index_deploy-5xl - - stf-crc-ocp_412-local_build-index_deploy-6xl + #- stf-crc-ocp_412-local_build-index_deploy-5xl + #- stf-crc-ocp_412-local_build-index_deploy-6xl