Permalink
Browse files

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
  • Loading branch information...
aakarshgopi committed Sep 21, 2018
1 parent d2cc39e commit 0b6383346174bcdef9d7521bc731a646ed6640b4
Showing with 8 additions and 4 deletions.
  1. +1 −1 ansible/oooq/browbeat-minimal.yml
  2. +7 −3 ansible/oooq/roles/pre-install-setup/tasks/main.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
@@ -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 }}/"

0 comments on commit 0b63833

Please sign in to comment.