From 23524fc05239eb42701d60712891cada05de1260 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 8 Apr 2025 19:14:39 +0100 Subject: [PATCH 1/2] [zuul] Add update job --- zuul.d/projects.yaml | 49 +++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index dcdf9bb46..1cf85ef17 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -35,6 +35,19 @@ - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling-tempest.yml" irrelevant-files: *irrelevant_files + # I may need to look closer at what the cifmw_run_update and cifmw_run_tests options do. + # The update job sets these to true, and also includes the update playbook as a run stage. +- job: + name: telemetry-operator-multinode-autoscaling-tempest-update + parent: podified-multinode-edpm-update-crc + description: | + Run update jobs with autoscaling features. + vars: + cifmw_extras: + - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml" + - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml" + - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling-tempest.yml" + - job: name: telemetry-operator-multinode-default-telemetry parent: podified-multinode-edpm-deployment-crc @@ -107,19 +120,23 @@ - podified-multinode-edpm-pipeline github-check: jobs: - - telemetry-operator-multinode-default-telemetry - - functional-graphing-tests-osp18: - voting: false - required-projects: - - name: infrawatch/feature-verification-tests - override-checkout: master - irrelevant-files: *irrelevant_files - - functional-autoscaling-tests-osp18: &fvt_jobs_config - voting: true - required-projects: - - name: infrawatch/feature-verification-tests - override-checkout: master - irrelevant-files: *irrelevant_files - - functional-logging-tests-osp18: *fvt_jobs_config - - feature-verification-tests-noop: - files: *irrelevant_files + #- telemetry-operator-multinode-autoscaling-tempest + - telemetry-operator-multinode-autoscaling-tempest-update: + dependencies: ["openstack-k8s-operators-content-provider"] + # - telemetry-operator-multinode-default-telemetry + # - functional-graphing-tests-osp18: + # voting: false + # required-projects: + # - name: infrawatch/feature-verification-tests + # override-checkout: master + # irrelevant-files: *irrelevant_files + # - functional-autoscaling-tests-osp18: &fvt_jobs_config + # voting: true + # required-projects: + # - name: infrawatch/feature-verification-tests + # override-checkout: master + # irrelevant-files: *irrelevant_files + # - functional-logging-tests-osp18: *fvt_jobs_config + # - functional-metric-verification-tests-osp18: *fvt_jobs_config + # - feature-verification-tests-noop: + # files: *irrelevant_files From 9f901a71398ad9d596bd3d196fdf7d156cdc59cd Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 16 May 2025 14:53:07 +0100 Subject: [PATCH 2/2] Run other jobs as controls --- zuul.d/projects.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 1cf85ef17..55bb363db 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -120,9 +120,12 @@ - podified-multinode-edpm-pipeline github-check: jobs: - #- telemetry-operator-multinode-autoscaling-tempest + - telemetry-operator-multinode-autoscaling-tempest: + dependencies: ["openstack-k8s-operators-content-provider"] - telemetry-operator-multinode-autoscaling-tempest-update: dependencies: ["openstack-k8s-operators-content-provider"] + - podified-multinode-edpm-update-crc: + dependencies: ["openstack-k8s-operators-content-provider"] # - telemetry-operator-multinode-default-telemetry # - functional-graphing-tests-osp18: # voting: false