From ad7b4c149bebd61e95f287ba5cc533de213d0282 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 2 Apr 2020 09:43:10 -0500
Subject: [PATCH] Run zuul-preview in zuul
Also rename the playbook to service-zuul-preview so that it's not
confusing about what it does.
Change-Id: I7a300ab4078a6473af0339d8cbf4b11e397ed837
---
.zuul.yaml | 16 +++++++++++++++-
...rvice-zuul.yaml => service-zuul-preview.yaml} | 0
run_all.sh | 4 ----
3 files changed, 15 insertions(+), 5 deletions(-)
rename playbooks/{service-zuul.yaml => service-zuul-preview.yaml} (100%)
diff --git a/.zuul.yaml b/.zuul.yaml
index 8536103661..7229baf484 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1312,7 +1312,7 @@
label: ubuntu-bionic
vars:
run_playbooks:
- - playbooks/service-zuul.yaml
+ - playbooks/service-zuul-preview.yaml
files:
- playbooks/install-ansible.yaml
- playbooks/roles/zuul-preview/
@@ -1683,6 +1683,18 @@
- playbooks/roles/install-docker/.*
- playbooks/roles/registry/.*
+- job:
+ name: infra-prod-service-zuul-preview
+ parent: infra-prod-service-base
+ description: Run service-zuul-preview.yaml playbook
+ vars:
+ playbook_name: service-zuul-preview.yaml
+ files:
+ - playbooks/service-zuul-preview.yaml
+ - playbooks/group_vars/zuul-preview.yaml
+ - playbooks/roles/install-docker/.*
+ - playbooks/roles/zuul-preview/.*
+
- job:
name: system-config-goaccess-report
description: |
@@ -2041,6 +2053,7 @@
- infra-prod-service-static
- infra-prod-service-backup
- infra-prod-service-registry
+ - infra-prod-service-zuul-preview
periodic:
jobs:
- developer-openstack-goaccess-report
@@ -2068,3 +2081,4 @@
- infra-prod-service-static
- infra-prod-service-backup
- infra-prod-service-registry
+ - infra-prod-service-zuul-preview
diff --git a/playbooks/service-zuul.yaml b/playbooks/service-zuul-preview.yaml
similarity index 100%
rename from playbooks/service-zuul.yaml
rename to playbooks/service-zuul-preview.yaml
diff --git a/run_all.sh b/run_all.sh
index bf87ece059..e045483841 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -72,10 +72,6 @@ set +e
# Run all the ansible playbooks under timeout to prevent them from getting
# stuck if they are oomkilled
-start_timer
-timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-zuul.yaml
-send_timer zuul
-
start_timer
timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-review-dev.yaml
send_timer nodepool