aboutsummaryrefslogtreecommitdiff
path: root/zuul.d
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2020-12-21 10:57:04 +0000
committerMark Goddard <mark@stackhpc.com>2020-12-21 10:57:15 +0000
commitb39964e5010120b671a834e434af86e8ad5194eb (patch)
treebcaac6915bda08a1a04516ea1826c49c4355b4c4 /zuul.d
parentf30cf262715fa444fdfb83729765f76654bfabf2 (diff)
downloadkolla-ansible-b39964e5010120b671a834e434af86e8ad5194eb.tar.gz
kolla-ansible-b39964e5010120b671a834e434af86e8ad5194eb.zip
CI: Switch upgrade jobs to Ubuntu focal 20.04
Since Victoria supports focal, we can switch the upgrade jobs to run on focal. Change-Id: I8f150b443af4fb831332836f90a9c38ff61a17cc
Diffstat (limited to 'zuul.d')
-rw-r--r--zuul.d/jobs.yaml4
-rw-r--r--zuul.d/nodesets.yaml6
2 files changed, 2 insertions, 8 deletions
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 5781fe16c..c81273c38 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -151,7 +151,7 @@
- job:
name: kolla-ansible-ubuntu-source-upgrade
parent: kolla-ansible-base
- nodeset: kolla-ansible-bionic
+ nodeset: kolla-ansible-focal
timeout: 9000
vars:
base_distro: ubuntu
@@ -172,7 +172,7 @@
- job:
name: kolla-ansible-ubuntu-source-upgrade-ceph-ansible
parent: kolla-ansible-ceph-ansible-base
- nodeset: kolla-ansible-bionic-multi
+ nodeset: kolla-ansible-focal-multi
timeout: 9000
vars:
base_distro: ubuntu
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 09f907799..e60c5617f 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -18,12 +18,6 @@
label: debian-buster-arm64
- nodeset:
- name: kolla-ansible-bionic
- nodes:
- - name: primary
- label: ubuntu-bionic
-
-- nodeset:
name: kolla-ansible-focal
nodes:
- name: primary