zuul
/
zuul
Code Issues Proposed changes

Use bionic images for zuul-stream-functional tests 

Zuul now requires at least python 3.6 so use the bionic image for the
zuul-stream-functional tests as well.

Change-Id: Iba47cd9733e97fba5b0471fdcfc69588f03f85d9
This commit is contained in:
Tobias Henkel 2020-09-04 16:22:14 +02:00
parent 405a0c1a88
commit bb2011cb38
No known key found for this signature in database
GPG Key ID: 03750DEC158E5FA2
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 name: zuul-functional-temp-master
nodes: nodes:
- name: controller - name: controller
label: ubuntu-xenial label: ubuntu-bionic
- name: node1 - name: node1
label: ubuntu-xenial label: ubuntu-bionic
- name: node2 - name: node2
label: ubuntu-xenial label: ubuntu-bionic
groups: groups:
- name: node - name: node
nodes: nodes:

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

@ -1,9 +1,8 @@
- hosts: controller - hosts: controller
tasks: tasks:
- name: Set python path fact - name: Set python path fact
set_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 - name: Run ansible that should succeed
command: > command: >

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

@ -4,7 +4,7 @@ gathering = smart
gather_subset = !all gather_subset = !all
lookup_plugins = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/lookup 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 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 stdout_callback = zuul_stream
library = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/library library = {{ ansible_user_dir }}/src/opendev.org/zuul/zuul/zuul/ansible/{{ zuul_ansible_version }}/library
retry_files_enabled = False retry_files_enabled = False