Skip to content

Commit

Permalink
Updating zuul's task to copy browbeat
Browse files Browse the repository at this point in the history
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
  • Loading branch information
aakarshg committed Oct 5, 2018
1 parent d2cc39e commit 0b63833
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion 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
Expand Down
10 changes: 7 additions & 3 deletions ansible/oooq/roles/pre-install-setup/tasks/main.yml
Expand Up @@ -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 }}/"
Expand Down

0 comments on commit 0b63833

Please sign in to comment.