summaryrefslogtreecommitdiff
path: root/.zuul.yaml
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-01-26 01:38:28 +0000
committerGerrit Code Review <review@openstack.org>2022-01-26 01:38:28 +0000
commit24acd74776e5f184210a364d203c8e947f796386 (patch)
treee37b70204f560b76986e95a5a17c1ead2431b828 /.zuul.yaml
parentcd68179f246ae9cec78daa47df377adf64431ca9 (diff)
parentb3a5a77d6023fd3ce039b7c4ae4c8a5174a5b452 (diff)
downloadzuul-24acd74776e5f184210a364d203c8e947f796386.tar.gz
Merge "Bump test nodes up to Focal"
Diffstat (limited to '.zuul.yaml')
-rw-r--r--.zuul.yaml14
1 files changed, 9 insertions, 5 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 7e2c29e8d..2f5976fc5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,12 +1,16 @@
- nodeset:
name: zuul-functional-temp-master
nodes:
+ # python_path in playbooks/zuul-stream/functional.yaml and
+ # callback_plugins in playbooks/zuul-stream/templates/ansible.cfg.j2
+ # need their python versions updated when these labels change to
+ # a platform that uses a different python version.
- name: controller
- label: ubuntu-bionic
+ label: ubuntu-focal
- name: node1
- label: ubuntu-bionic
+ label: ubuntu-focal
- name: node2
- label: ubuntu-bionic
+ label: ubuntu-focal
groups:
- name: node
nodes:
@@ -47,7 +51,7 @@
description: |
Zuul unit tests with ZooKeeper running
parent: tox
- nodeset: ubuntu-bionic
+ nodeset: ubuntu-focal
pre-run: playbooks/zuul-tox/pre.yaml
post-run: playbooks/zuul-tox/post-system-logs.yaml
vars:
@@ -88,7 +92,6 @@
vars:
zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/zuul'].src_dir }}"
tox_envlist: zuul_client
- nodeset: ubuntu-bionic
- job:
name: zuul-tox-py36
@@ -97,6 +100,7 @@
vars:
tox_envlist: py36
python_version: 3.6
+ nodeset: ubuntu-bionic
- job:
name: zuul-tox-py38