From b9f7f5506f30cdcf906b40b77b0ed1277542350f Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Fri, 24 Jul 2020 09:03:36 -0700
Subject: [PATCH] Use infra-prod-base in infra-prod jobs

This uses a new base job which handles pushing the git repos on to
bridge since that must now happen in a trusted playbook.

Depends-On: https://review.opendev.org/742934
Change-Id: Ie6d0668f83af801c0c0e920b676f2f49e19c59f6
---
 playbooks/zuul/run-production-playbook.yaml | 31 ---------------------
 zuul.d/infra-prod.yaml                      |  1 +
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/playbooks/zuul/run-production-playbook.yaml b/playbooks/zuul/run-production-playbook.yaml
index 7b3d68065a..293e54e3cf 100644
--- a/playbooks/zuul/run-production-playbook.yaml
+++ b/playbooks/zuul/run-production-playbook.yaml
@@ -1,36 +1,5 @@
-- hosts: localhost
-  tasks:
-    - name: Add bridge.o.o to inventory
-      add_host:
-        name: bridge.openstack.org
-        ansible_python_interpreter: python3
-        ansible_user: zuul
-        # Without setting ansible_host directly, mirror-workspace-git-repos
-        # gets sad because if delegate_to localhost and with add_host that
-        # ends up with ansible_host being localhost. 
-        ansible_host: bridge.openstack.org
-        ansible_port: 22
-
-- hosts: localhost
-  tasks:
-    - name: Add bridge.o.o hostkey to known hosts
-      known_hosts:
-        name: bridge.openstack.org
-        key: "bridge.openstack.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxRzDkWvvVQtsLTAqAwedRWA84/42KKVdFS0QP8lZFsMpgTXUhjipJ7VcFun5gM87tnt0J71rlN+ospBh0/1wfp2jASEskUyGhXAa5xHjnJN7veUyW+AggEosK/OTunvZgf54p1sQg45Sq/uCjc0Ua0fRMOq2o5z/mgpl6rSjLOlWi9wKA/6axnUbs9w4iD5esyBQ+VcISSJOTqhAo/3UG0NwCU+6Ggwwhg0nl5iCMpQfq4A207IbJ72MkJzlQgW3edsRb5POzdZcGxkTYvVdP3kgHP4Bof3MFFZjBUMz6SuRQyNV5poysMtbtlO0SvgAJNhXr6Vn0GA9XhqFP6+HT"
-
 - hosts: bridge.openstack.org
   tasks:
-    - name: Make sure a manaul maint isn't going on
-      wait_for:
-        path: /home/zuul/DISABLE-ANSIBLE
-        state: absent
-        sleep: 10
-        timeout: 3600 # Wait for an hour before bailing
-
-    - name: Synchronize src repos to workspace directory.
-      include_role:
-        name: prepare-workspace-git
-
     - name: Should we run from master
       set_fact:
         infra_prod_run_from_master: "{{ zuul.pipeline|default('') in ['periodic', 'opendev-prod-hourly'] }}"
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index d52bbe21c2..bd20834ca0 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -5,6 +5,7 @@
 
 - job:
     name: infra-prod-playbook
+    parent: opendev-infra-prod-base
     description: |
       Run specified playbook against productions hosts.