From 0b6383346174bcdef9d7521bc731a646ed6640b4 Mon Sep 17 00:00:00 2001 From: agopi Date: Fri, 21 Sep 2018 09:05:32 -0400 Subject: [PATCH] Updating zuul's task to copy browbeat Using zuul vars to copy browbeat to undercloud for v3job. This will ensure that zuul jobs both legacy and v3 will use the path instead of looking at workspace which is not where browbeat is cloned in v3 job. Change-Id: Ic5d875493ed6b8e85a559eb0f05d34b9a74f0930 --- ansible/oooq/browbeat-minimal.yml | 2 +- ansible/oooq/roles/pre-install-setup/tasks/main.yml | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ansible/oooq/browbeat-minimal.yml b/ansible/oooq/browbeat-minimal.yml index 9ca45d474..1783b5e03 100644 --- 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 index b23b07e77..72f2162a9 100644 --- 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 }}/"