zuul
/
zuul
Code Issues Proposed changes

Merge "Use bionic images for zuul-stream-functional tests"

This commit is contained in:
Zuul 2020-09-28 22:55:15 +00:00 committed by Gerrit Code Review
parent 01301840e9 bb2011cb38
commit 5c27be2379
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.zuul.yaml
View File

@ -2,11 +2,11 @@
name: zuul-functional-temp-master
nodes:
- name: controller
label: ubuntu-xenial
label: ubuntu-bionic
- name: node1
label: ubuntu-xenial
label: ubuntu-bionic
- name: node2
label: ubuntu-xenial
label: ubuntu-bionic
groups:
- name: node
nodes:

3
playbooks/zuul-stream/functional.yaml
View File

@ -1,9 +1,8 @@
- hosts: controller
tasks:
- name: Set python path fact
set_fact:
python_path: "/usr/local/lib/python3.5/dist-packages"
python_path: "/usr/local/lib/python3.6/dist-packages"
- name: Run ansible that should succeed
command: >

2
playbooks/zuul-stream/templates/ansible.cfg.j2
View File

@ -4,7 +4,7 @@ gathering = smart
gather_subset = !all
lookup_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/lookup
action_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/actiongeneral:{{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/action
callback_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/callback:/usr/lib/zuul/ansible/{{ zuul_ansible_version }}/lib/python3.5/site-packages/ara/plugins/callbacks
callback_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/callback:/usr/lib/zuul/ansible/{{ zuul_ansible_version }}/lib/python3.6/site-packages/ara/plugins/callbacks
stdout_callback = zuul_stream
library = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/library
retry_files_enabled = False