From 120fc5d892184b44bda53862cb3f1da1c7cf99b2 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Wed, 23 Sep 2020 11:37:00 +0200
Subject: [PATCH] Switch integration testing to Ubuntu Focal

Bionic is left in a non-voting job and is still supported.

Change-Id: I1d006da7bc7c0836b194aa1dd03f7513ee5f3c00
---
 .../notes/focal-e40fdd37d11faac9.yaml         |  5 +++
 zuul.d/bifrost-jobs.yaml                      | 32 +++++++++++++------
 zuul.d/project.yaml                           | 16 +++++-----
 3 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 releasenotes/notes/focal-e40fdd37d11faac9.yaml

diff --git a/releasenotes/notes/focal-e40fdd37d11faac9.yaml b/releasenotes/notes/focal-e40fdd37d11faac9.yaml
new file mode 100644
index 000000000..f82477ec8
--- /dev/null
+++ b/releasenotes/notes/focal-e40fdd37d11faac9.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    The primary supported version of Ubuntu is now 20.04 (Focal). Ubuntu 18.04
+    (Bionic) is still supported, but may be removed in a future release.
diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml
index 8ee1e0966..b7316234b 100644
--- a/zuul.d/bifrost-jobs.yaml
+++ b/zuul.d/bifrost-jobs.yaml
@@ -37,9 +37,9 @@
       noauth_mode: true
 
 - job:
-    name: bifrost-integration-dhcp-ubuntu-bionic
+    name: bifrost-integration-dhcp-ubuntu-focal
     parent: bifrost-integration-dhcp
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
 
 - job:
     name: bifrost-integration-dhcp-centos-8
@@ -54,9 +54,9 @@
       build_image: true
 
 - job:
-    name: bifrost-integration-dibipa-debian-ubuntu-bionic
+    name: bifrost-integration-dibipa-debian-ubuntu-focal
     parent: bifrost-integration-dibipa-debian
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
 
 - job:
     name: bifrost-integration-dibipa-debian-centos-8
@@ -75,6 +75,7 @@
     parent: bifrost-integration-tinyipa
     nodeset: ubuntu-bionic
 
+# TODO(dtantsur): remove when no other projects are using this job
 - job:
     name: bifrost-integration-tinyipa-keystone-ubuntu-bionic
     parent: bifrost-integration-tinyipa
@@ -86,17 +87,28 @@
       enable_tls: true
       test_driver: redfish
 
-- job:
-    name: bifrost-cli-ubuntu-bionic
-    parent: bifrost-integration-tinyipa-ubuntu-bionic
-    vars:
-      cli_test: true
-
 - job:
     name: bifrost-integration-tinyipa-ubuntu-focal
     parent: bifrost-integration-tinyipa
     nodeset: ubuntu-focal
 
+- job:
+    name: bifrost-integration-tinyipa-keystone-ubuntu-focal
+    parent: bifrost-integration-tinyipa
+    nodeset: ubuntu-focal
+    required-projects:
+      - openstack/keystone
+    vars:
+      enable_keystone: true
+      enable_tls: true
+      test_driver: redfish
+
+- job:
+    name: bifrost-cli-ubuntu-focal
+    parent: bifrost-integration-tinyipa-ubuntu-focal
+    vars:
+      cli_test: true
+
 - job:
     name: bifrost-integration-tinyipa-centos-8
     parent: bifrost-integration-tinyipa
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ef38eae96..73f504b1e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,12 +8,12 @@
     check:
       jobs:
         - bifrost-tox-linters
-        - bifrost-integration-tinyipa-ubuntu-bionic
+        - bifrost-integration-tinyipa-ubuntu-focal
         - bifrost-integration-tinyipa-centos-8
-        - bifrost-integration-tinyipa-keystone-ubuntu-bionic
+        - bifrost-integration-tinyipa-keystone-ubuntu-focal
         - bifrost-integration-tinyipa-keystone-centos-8
         # Non-voting jobs
-        - bifrost-integration-tinyipa-ubuntu-focal:
+        - bifrost-integration-tinyipa-ubuntu-bionic:
             voting: false
         - bifrost-integration-tinyipa-opensuse-15:
             voting: false
@@ -21,15 +21,15 @@
             voting: false
         - bifrost-integration-tinyipa-debian-buster:
             voting: false
-        - bifrost-integration-dhcp-ubuntu-bionic:
+        - bifrost-integration-dhcp-ubuntu-focal:
             voting: false
         - bifrost-integration-dhcp-centos-8:
             voting: false
-        - bifrost-integration-dibipa-debian-ubuntu-bionic:
+        - bifrost-integration-dibipa-debian-ubuntu-focal:
             voting: false
         - bifrost-integration-dibipa-debian-centos-8:
             voting: false
-        - bifrost-cli-ubuntu-bionic:
+        - bifrost-cli-ubuntu-focal:
             voting: false
         - bifrost-collections-src:
             voting: false
@@ -52,7 +52,7 @@
     gate:
       jobs:
         - bifrost-tox-linters
-        - bifrost-integration-tinyipa-ubuntu-bionic
+        - bifrost-integration-tinyipa-ubuntu-focal
         - bifrost-integration-tinyipa-centos-8
-        - bifrost-integration-tinyipa-keystone-ubuntu-bionic
+        - bifrost-integration-tinyipa-keystone-ubuntu-focal
         - bifrost-integration-tinyipa-keystone-centos-8