diff options
| author | Tobias Henkel <tobias.henkel@bmw.de> | 2020-09-04 16:22:14 +0200 |
|---|---|---|
| committer | Tobias Henkel <tobias.henkel@bmw.de> | 2020-09-23 15:35:08 +0200 |
| commit | bb2011cb38ddaddbe1c3b76241c074017f323f39 (patch) | |
| tree | 2927fa350ad9211a4507e27258c0d9d4a72184f0 | |
| parent | 405a0c1a88653efdb66ba82cb41dcd0b54745fd3 (diff) | |
| download | zuul-bb2011cb38ddaddbe1c3b76241c074017f323f39.tar.gz | |
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
| -rw-r--r-- | .zuul.yaml | 6 | ||||
| -rw-r--r-- | playbooks/zuul-stream/functional.yaml | 3 | ||||
| -rw-r--r-- | playbooks/zuul-stream/templates/ansible.cfg.j2 | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 6607ce12b..ec0a58a23 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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: diff --git a/playbooks/zuul-stream/functional.yaml b/playbooks/zuul-stream/functional.yaml index d3a73d7f9..9c4b2c960 100644 --- a/playbooks/zuul-stream/functional.yaml +++ b/playbooks/zuul-stream/functional.yaml @@ -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: > diff --git a/playbooks/zuul-stream/templates/ansible.cfg.j2 b/playbooks/zuul-stream/templates/ansible.cfg.j2 index d07874d4a..612d2cdf6 100644 --- a/playbooks/zuul-stream/templates/ansible.cfg.j2 +++ b/playbooks/zuul-stream/templates/ansible.cfg.j2 @@ -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 |