Merge "Run backup in zuul"

.zuul.yaml

@@ -1660,6 +1660,17 @@
       - playbooks/roles/static/.*
       - playbooks/roles/zuul-user/.*
 
+- job:
+    name: infra-prod-service-backup
+    parent: infra-prod-service-base
+    description: Run service-backup.yaml playbook
+    vars:
+      playbook_name: service-backup.yaml
+    files:
+      - playbooks/service-backup.yaml
+      - playbooks/roles/backup/.*
+      - playbooks/roles/backup-server/.*
+
 - job:
     name: system-config-goaccess-report
     description: |
@@ -2016,6 +2027,7 @@
         - infra-prod-service-mirror-update
         - infra-prod-service-mirror
         - infra-prod-service-static
+        - infra-prod-service-backup
     periodic:
       jobs:
         - developer-openstack-goaccess-report
@@ -2041,3 +2053,4 @@
         - infra-prod-service-mirror-update
         - infra-prod-service-mirror
         - infra-prod-service-static
+        - infra-prod-service-backup

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-backup.yaml
-send_timer backup
-
 start_timer
 timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-registry.yaml
 send_timer registry