Skip to content
Snippets Groups Projects
Commit 1859f3f1 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

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

parents f2a48e3e b39964e5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
zuul.d/jobs.yaml
+ 2
− 2
View file @ 1859f3f1
...@@ -151,7 +151,7 @@ ...@@ -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 @@ ...@@ -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
......
zuul.d/nodesets.yaml
+ 0
− 6
View file @ 1859f3f1
...@@ -17,12 +17,6 @@ ...@@ -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:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment