Merge "Updating zuul's task to copy browbeat"

cloud-bulldozer · Oct 8, 2018 · 87db737 · 87db737
2 parents 7b3b570 + 0b63833
commit 87db737
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ansible/oooq/browbeat-minimal.yml b/ansible/oooq/browbeat-minimal.yml
@@ -1,6 +1,6 @@
 ---
 # Browbeat integration test
-# Check upstream CI
+# Check upstream zuul CI
 
 - include: configure-browbeat.yml
   when: enable_minimal_browbeat|default(false)|bool

diff --git a/ansible/oooq/roles/pre-install-setup/tasks/main.yml b/ansible/oooq/roles/pre-install-setup/tasks/main.yml
@@ -14,9 +14,13 @@
     path: "/home/zuul/workspace/"
   register: zuul_workspace
 
-- name: Copy browbeat to the undercloud - zuul user
-  synchronize: "src=/home/zuul/workspace/openstack/browbeat dest={{ ansible_env.HOME }}/"
-  when: ansible_user == "zuul" and zuul_workspace.stat.exists
+- name: Copy browbeat to the undercloud - zuul v3
+  synchronize: "src={{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/browbeat'].src_dir }} dest={{ ansible_env.HOME }}/"
+  when: ansible_user == "zuul" and zuul_workspace.stat.exists and zuul is defined and zuul.projects is defined
+
+- name: Copy browbeat to the undercloud - zuul legacy
+  synchronize: "src={{ ansible_user_dir }}/workspace/openstack/browbeat dest={{ ansible_env.HOME }}/"
+  when: ansible_user == "zuul" and zuul_workspace.stat.exists and zuul is not defined and zuul.projects is not defined
 
 - name: Copy browbeat to the undercloud - zuul user reproducer
   synchronize: "src=/opt/stack/browbeat dest={{ ansible_env.HOME }}/"