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

2021-01-05 08:50:28 +00:00 · 2021-01-05 08:50:28 +00:00 · 1859f3f1af
parent f2a48e3e52 b39964e501
commit 1859f3f1af
2 changed files with 2 additions and 8 deletions
--- 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
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@ -17,12 +17,6 @@
      - name: primary
        label: debian-buster-arm64

- nodeset:
-    name: kolla-ansible-bionic
-    nodes:
-      - name: primary
-        label: ubuntu-bionic
-
 - nodeset:
    name: kolla-ansible-focal
    nodes: