Merge "CI: Switch upgrade jobs to Ubuntu focal 20.04"

This commit is contained in:
Zuul 2021-01-05 08:50:28 +00:00 committed by Gerrit Code Review
commit 1859f3f1af
2 changed files with 2 additions and 8 deletions

View File

@ -151,7 +151,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-upgrade name: kolla-ansible-ubuntu-source-upgrade
parent: kolla-ansible-base parent: kolla-ansible-base
nodeset: kolla-ansible-bionic nodeset: kolla-ansible-focal
timeout: 9000 timeout: 9000
vars: vars:
base_distro: ubuntu base_distro: ubuntu
@ -172,7 +172,7 @@
- job: - job:
name: kolla-ansible-ubuntu-source-upgrade-ceph-ansible name: kolla-ansible-ubuntu-source-upgrade-ceph-ansible
parent: kolla-ansible-ceph-ansible-base parent: kolla-ansible-ceph-ansible-base
nodeset: kolla-ansible-bionic-multi nodeset: kolla-ansible-focal-multi
timeout: 9000 timeout: 9000
vars: vars:
base_distro: ubuntu base_distro: ubuntu

View File

@ -17,12 +17,6 @@
- name: primary - name: primary
label: debian-buster-arm64 label: debian-buster-arm64
- nodeset:
name: kolla-ansible-bionic
nodes:
- name: primary
label: ubuntu-bionic
- nodeset: - nodeset:
name: kolla-ansible-focal name: kolla-ansible-focal
nodes: nodes: