From b5f55ff69e368a33a59839bfe45e0b2ac853a806 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Mon, 5 Feb 2024 12:32:58 -0800 Subject: [PATCH] Get rid of *-aio-* job suffixes Not so long ago we unified the way how to run test jobs and made most of the jobs run on multiple nodes. Infra jobs were renamed, so they don't refer to aio (short for all-in -one). Change-Id: I9c3b8cd18178aa57ce44564490ef1b61f275ae29 --- zuul.d/base.yaml | 20 ++++++++++---------- zuul.d/elasticsearch-s3.yaml | 2 +- zuul.d/fluentd.yaml | 2 +- zuul.d/nagios.yaml | 2 +- zuul.d/node-problem-detector.yaml | 2 +- zuul.d/opensearch-s3.yaml | 2 +- zuul.d/osh-selenium.yaml | 4 ++-- zuul.d/prometheus-openstack-exporter.yaml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index efa51fc2..6d03522a 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -17,8 +17,8 @@ check: jobs: - openstack-helm-images-buildset-registry - - openstack-helm-images-aio-monitoring - - openstack-helm-images-aio-logging + - openstack-helm-images-monitoring + - openstack-helm-images-logging - openstack-helm-images-compute-kit-yoga-ubuntu_focal - openstack-helm-images-cinder-yoga-ubuntu_focal - openstack-helm-images-compute-kit-zed-ubuntu_focal @@ -31,8 +31,8 @@ gate: jobs: - openstack-helm-images-buildset-registry - - openstack-helm-images-aio-monitoring - - openstack-helm-images-aio-logging + - openstack-helm-images-monitoring + - openstack-helm-images-logging - openstack-helm-images-compute-kit-yoga-ubuntu_focal - openstack-helm-images-cinder-yoga-ubuntu_focal - openstack-helm-images-compute-kit-zed-ubuntu_focal @@ -45,8 +45,8 @@ periodic-weekly: jobs: - openstack-helm-images-buildset-registry - - openstack-helm-images-aio-monitoring - - openstack-helm-images-aio-logging + - openstack-helm-images-monitoring + - openstack-helm-images-logging - openstack-helm-images-compute-kit-yoga-ubuntu_focal - openstack-helm-images-cinder-yoga-ubuntu_focal - openstack-helm-images-compute-kit-zed-ubuntu_focal @@ -148,8 +148,8 @@ # Image testing jobs inheriting from osh and osh-infra jobs running against # particular image or set of images. - job: - name: openstack-helm-images-aio-monitoring - parent: openstack-helm-infra-aio-monitoring + name: openstack-helm-images-monitoring + parent: openstack-helm-infra-monitoring match-on-config-updates: false dependencies: - name: openstack-helm-images-build-prometheus-openstack-exporter @@ -179,8 +179,8 @@ - zuul.d/nagios.yaml - job: - name: openstack-helm-images-aio-logging - parent: openstack-helm-infra-aio-logging + name: openstack-helm-images-logging + parent: openstack-helm-infra-logging match-on-config-updates: false dependencies: - name: openstack-helm-images-build-fluentd diff --git a/zuul.d/elasticsearch-s3.yaml b/zuul.d/elasticsearch-s3.yaml index c2d52f4f..8cdec1b7 100644 --- a/zuul.d/elasticsearch-s3.yaml +++ b/zuul.d/elasticsearch-s3.yaml @@ -26,7 +26,7 @@ - openstack-helm-images-upload-elasticsearch-s3 - openstack-helm-images-promote-elasticsearch-s3: dependencies: - - name: openstack-helm-images-aio-logging + - name: openstack-helm-images-logging - job: name: openstack-helm-images-build-elasticsearch-s3 diff --git a/zuul.d/fluentd.yaml b/zuul.d/fluentd.yaml index 740b02b1..96e3e690 100644 --- a/zuul.d/fluentd.yaml +++ b/zuul.d/fluentd.yaml @@ -26,7 +26,7 @@ - openstack-helm-images-upload-fluentd - openstack-helm-images-promote-fluentd: dependencies: - - name: openstack-helm-images-aio-monitoring + - name: openstack-helm-images-monitoring - job: name: openstack-helm-images-build-fluentd diff --git a/zuul.d/nagios.yaml b/zuul.d/nagios.yaml index 3010771d..eb022621 100644 --- a/zuul.d/nagios.yaml +++ b/zuul.d/nagios.yaml @@ -26,7 +26,7 @@ - openstack-helm-images-upload-nagios - openstack-helm-images-promote-nagios: dependencies: - - name: openstack-helm-images-aio-monitoring + - name: openstack-helm-images-monitoring - job: name: openstack-helm-images-build-nagios diff --git a/zuul.d/node-problem-detector.yaml b/zuul.d/node-problem-detector.yaml index 26dfabe0..cee827e1 100644 --- a/zuul.d/node-problem-detector.yaml +++ b/zuul.d/node-problem-detector.yaml @@ -26,7 +26,7 @@ - openstack-helm-images-upload-node-problem-detector - openstack-helm-images-promote-node-problem-detector: dependencies: - - name: openstack-helm-images-aio-monitoring + - name: openstack-helm-images-monitoring - job: name: openstack-helm-images-build-node-problem-detector diff --git a/zuul.d/opensearch-s3.yaml b/zuul.d/opensearch-s3.yaml index b5570866..c001d214 100644 --- a/zuul.d/opensearch-s3.yaml +++ b/zuul.d/opensearch-s3.yaml @@ -26,7 +26,7 @@ - openstack-helm-images-upload-opensearch-s3 - openstack-helm-images-promote-opensearch-s3: dependencies: - - name: openstack-helm-images-aio-logging + - name: openstack-helm-images-logging - job: name: openstack-helm-images-build-opensearch-s3 diff --git a/zuul.d/osh-selenium.yaml b/zuul.d/osh-selenium.yaml index 62d125db..e08931f0 100644 --- a/zuul.d/osh-selenium.yaml +++ b/zuul.d/osh-selenium.yaml @@ -28,8 +28,8 @@ - openstack-helm-images-upload-osh-selenium - openstack-helm-images-promote-osh-selenium: dependencies: - - name: openstack-helm-images-aio-monitoring - - name: openstack-helm-images-aio-logging + - name: openstack-helm-images-monitoring + - name: openstack-helm-images-logging - job: name: openstack-helm-images-build-osh-selenium diff --git a/zuul.d/prometheus-openstack-exporter.yaml b/zuul.d/prometheus-openstack-exporter.yaml index 09cc27e0..144affb7 100644 --- a/zuul.d/prometheus-openstack-exporter.yaml +++ b/zuul.d/prometheus-openstack-exporter.yaml @@ -26,7 +26,7 @@ - openstack-helm-images-upload-prometheus-openstack-exporter - openstack-helm-images-promote-prometheus-openstack-exporter: dependencies: - - name: openstack-helm-images-aio-monitoring + - name: openstack-helm-images-monitoring - job: name: openstack-helm-images-build-prometheus-openstack-exporter