diff --git a/zuul.d/alerta.yaml b/zuul.d/alerta.yaml index 2885a7a5..7915e9f4 100644 --- a/zuul.d/alerta.yaml +++ b/zuul.d/alerta.yaml @@ -24,6 +24,9 @@ periodic: jobs: - openstack-helm-images-upload-alerta + - openstack-helm-images-promote-alerta: + dependencies: + - name: openstack-helm-images-aio-monitoring - job: name: openstack-helm-images-build-alerta diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 55c939d9..a548d881 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -114,10 +114,6 @@ run: zuul.d/playbooks/build.yml post-run: - zuul.d/playbooks/upload.yml - # Synthetic logic required with current implementation. - # Standalone promote job starts once upload one pauses that is undesired, - # thus running promote role here for periodic pipeline - - zuul.d/playbooks/periodic-promote.yml match-on-config-updates: false dependencies: - name: opendev-buildset-registry diff --git a/zuul.d/elasticsearch-s3.yaml b/zuul.d/elasticsearch-s3.yaml index 927513d2..540f1e2c 100644 --- a/zuul.d/elasticsearch-s3.yaml +++ b/zuul.d/elasticsearch-s3.yaml @@ -24,6 +24,9 @@ periodic: jobs: - openstack-helm-images-upload-elasticsearch-s3 + - openstack-helm-images-promote-elasticsearch-s3: + dependencies: + - name: openstack-helm-images-aio-logging - job: name: openstack-helm-images-build-elasticsearch-s3 diff --git a/zuul.d/fluentd.yaml b/zuul.d/fluentd.yaml index 2d749abb..c89138ef 100644 --- a/zuul.d/fluentd.yaml +++ b/zuul.d/fluentd.yaml @@ -24,6 +24,9 @@ periodic: jobs: - openstack-helm-images-upload-fluentd + - openstack-helm-images-promote-fluentd: + dependencies: + - name: openstack-helm-images-aio-monitoring - job: name: openstack-helm-images-build-fluentd diff --git a/zuul.d/libvirt.yaml b/zuul.d/libvirt.yaml index 7e216135..d1486df4 100644 --- a/zuul.d/libvirt.yaml +++ b/zuul.d/libvirt.yaml @@ -26,6 +26,10 @@ periodic: jobs: - openstack-helm-images-upload-libvirt + - openstack-helm-images-promote-libvirt: + dependencies: + - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic + - name: openstack-helm-images-compute-kit-train-ubuntu_bionic - job: name: openstack-helm-images-build-libvirt diff --git a/zuul.d/mariadb.yaml b/zuul.d/mariadb.yaml index e157bc57..f03f6520 100644 --- a/zuul.d/mariadb.yaml +++ b/zuul.d/mariadb.yaml @@ -26,6 +26,12 @@ periodic: jobs: - openstack-helm-images-upload-mariadb + - openstack-helm-images-promote-mariadb: + dependencies: + - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic + - name: openstack-helm-images-compute-kit-train-ubuntu_bionic + - name: openstack-helm-images-cinder-stein-ubuntu_bionic + - name: openstack-helm-images-cinder-train-ubuntu_bionic - job: name: openstack-helm-images-build-mariadb diff --git a/zuul.d/minikube-aio.yaml b/zuul.d/minikube-aio.yaml index da459cae..acdf8ae1 100644 --- a/zuul.d/minikube-aio.yaml +++ b/zuul.d/minikube-aio.yaml @@ -24,6 +24,15 @@ periodic: jobs: - openstack-helm-images-upload-minikube-aio + - openstack-helm-images-promote-minikube-aio: + dependencies: + - name: openstack-helm-images-aio-monitoring + - name: openstack-helm-images-aio-logging + - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic + - name: openstack-helm-images-compute-kit-train-ubuntu_bionic + - name: openstack-helm-images-cinder-stein-ubuntu_bionic + - name: openstack-helm-images-cinder-train-ubuntu_bionic + - name: openstack-helm-images-horizon-stein-ubuntu_bionic - job: name: openstack-helm-images-build-minikube-aio diff --git a/zuul.d/nagios.yaml b/zuul.d/nagios.yaml index 8bfbe0df..3f37b1cd 100644 --- a/zuul.d/nagios.yaml +++ b/zuul.d/nagios.yaml @@ -24,6 +24,9 @@ periodic: jobs: - openstack-helm-images-upload-nagios + - openstack-helm-images-promote-nagios: + dependencies: + - name: openstack-helm-images-aio-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 2122a7cd..20ad79cc 100644 --- a/zuul.d/node-problem-detector.yaml +++ b/zuul.d/node-problem-detector.yaml @@ -24,6 +24,9 @@ periodic: jobs: - openstack-helm-images-upload-node-problem-detector + - openstack-helm-images-promote-node-problem-detector: + dependencies: + - name: openstack-helm-images-aio-monitoring - job: name: openstack-helm-images-build-node-problem-detector diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml index 0b0635c6..bfbf4b7d 100644 --- a/zuul.d/openstack-loci.yaml +++ b/zuul.d/openstack-loci.yaml @@ -55,7 +55,16 @@ - openstack-helm-images-upload-openstack-loci-rocky-ubuntu_xenial - openstack-helm-images-upload-openstack-loci-rocky-ubuntu_bionic - openstack-helm-images-upload-openstack-loci-stein-ubuntu_bionic + - openstack-helm-images-promote-openstack-loci-stein-ubuntu_bionic: + dependencies: + - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic + - name: openstack-helm-images-cinder-stein-ubuntu_bionic + - name: openstack-helm-images-horizon-stein-ubuntu_bionic - openstack-helm-images-upload-openstack-loci-train-ubuntu_bionic + - openstack-helm-images-promote-openstack-loci-train-ubuntu_bionic: + dependencies: + - name: openstack-helm-images-compute-kit-train-ubuntu_bionic + - name: openstack-helm-images-cinder-train-ubuntu_bionic - openstack-helm-images-upload-openstack-loci-ussuri-ubuntu_bionic - openstack-helm-images-upload-openstack-loci-master-ubuntu_bionic diff --git a/zuul.d/openvswitch.yaml b/zuul.d/openvswitch.yaml index 905c2188..8dbed74d 100644 --- a/zuul.d/openvswitch.yaml +++ b/zuul.d/openvswitch.yaml @@ -26,6 +26,12 @@ periodic: jobs: - openstack-helm-images-upload-openvswitch + - openstack-helm-images-promote-openvswitch: + dependencies: + - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic + - name: openstack-helm-images-compute-kit-train-ubuntu_bionic + - name: openstack-helm-images-cinder-stein-ubuntu_bionic + - name: openstack-helm-images-cinder-train-ubuntu_bionic - job: name: openstack-helm-images-build-openvswitch diff --git a/zuul.d/osh-selenium.yaml b/zuul.d/osh-selenium.yaml index 0b008b1e..1757e8d6 100644 --- a/zuul.d/osh-selenium.yaml +++ b/zuul.d/osh-selenium.yaml @@ -26,6 +26,11 @@ periodic: jobs: - 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-horizon-stein-ubuntu_bionic - job: name: openstack-helm-images-build-osh-selenium diff --git a/zuul.d/ospurge.yaml b/zuul.d/ospurge.yaml index 594bde72..207427a9 100644 --- a/zuul.d/ospurge.yaml +++ b/zuul.d/ospurge.yaml @@ -26,6 +26,9 @@ periodic: jobs: - openstack-helm-images-upload-ospurge + - openstack-helm-images-promote-ospurge: + dependencies: + - name: openstack-helm-images-compute-kit-stein-ubuntu_bionic - job: name: openstack-helm-images-build-ospurge diff --git a/zuul.d/patroni.yaml b/zuul.d/patroni.yaml index 1d237a58..82c01bd9 100644 --- a/zuul.d/patroni.yaml +++ b/zuul.d/patroni.yaml @@ -26,6 +26,9 @@ periodic: jobs: - openstack-helm-images-upload-patroni + - openstack-helm-images-promote-patroni: + dependencies: + - name: openstack-helm-images-aio-monitoring - job: name: openstack-helm-images-build-patroni diff --git a/zuul.d/playbooks/build-loci.yml b/zuul.d/playbooks/build-loci.yml index 65b74ef2..3a5b4c50 100644 --- a/zuul.d/playbooks/build-loci.yml +++ b/zuul.d/playbooks/build-loci.yml @@ -80,10 +80,3 @@ loop: "{{ docker_images }}" loop_control: loop_var: zj_image - - - name: Pause the job - when: buildset_registry is defined and zuul.pipeline != 'check' - zuul_return: - data: - zuul: - pause: true diff --git a/zuul.d/playbooks/build.yml b/zuul.d/playbooks/build.yml index e981a0d3..758d32ce 100644 --- a/zuul.d/playbooks/build.yml +++ b/zuul.d/playbooks/build.yml @@ -11,9 +11,3 @@ loop: "{{ docker_images }}" loop_control: loop_var: zj_image - - name: Pause the job - when: buildset_registry is defined and zuul.pipeline != 'check' - zuul_return: - data: - zuul: - pause: true diff --git a/zuul.d/playbooks/periodic-promote.yml b/zuul.d/playbooks/periodic-promote.yml deleted file mode 100644 index 752d7b91..00000000 --- a/zuul.d/playbooks/periodic-promote.yml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - role: promote-docker-image - when: zuul.pipeline == 'periodic' diff --git a/zuul.d/prometheus-openstack-exporter.yaml b/zuul.d/prometheus-openstack-exporter.yaml index 58af35c0..40e2e6b0 100644 --- a/zuul.d/prometheus-openstack-exporter.yaml +++ b/zuul.d/prometheus-openstack-exporter.yaml @@ -24,6 +24,9 @@ periodic: jobs: - openstack-helm-images-upload-prometheus-openstack-exporter + - openstack-helm-images-promote-prometheus-openstack-exporter: + dependencies: + - name: openstack-helm-images-aio-monitoring - job: name: openstack-helm-images-build-prometheus-openstack-exporter