x
/
browbeat
Code Issues Proposed changes

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
This commit is contained in:
agopi 2018-09-21 09:05:32 -04:00
parent d2cc39e10d
commit 0b63833461
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/oooq/browbeat-minimal.yml
View File

@ -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

10
ansible/oooq/roles/pre-install-setup/tasks/main.yml
View File

@ -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 }}/"