Merge "Add support for ubuntu 20.04 LTS and Python 3.8"

roles/tobiko-ensure-python3/vars/Ubuntu-18.yaml

@@ -0,0 +1,9 @@
+---
+
+python_packages:
+  python3:
+    - python3
+    - python3-pip
+  python3.6:
+    - python3.6
+    - python3.6-pip

roles/tobiko-ensure-python3/vars/Ubuntu.yaml

@@ -4,6 +4,6 @@ python_packages:
   python3:
     - python3
     - python3-pip
-  python3.6:
-    - python3.6
-    - python3.6-pip
+  python3.8:
+    - python3.8
+    - python3.8-pip

zuul.d/infrared.yaml

@@ -31,7 +31,7 @@
     nodeset: centos-8-2-node
     voting: true
     description: |
-      Run py36 test cases using tobiko infrared plugin on CentOS 8
+      Run test cases using tobiko infrared plugin on CentOS 8
 
 
 - job:
@@ -40,4 +40,17 @@
     nodeset: ubuntu-bionic-2-node
     voting: false
     description: |
-      Run py36 test cases using tobiko infrared plugin on Ubuntu Bionic
+      Run test cases using tobiko infrared plugin on Ubuntu Bionic
+
+
+- job:
+    name: tobiko-tox-infrared-ubuntu-focal
+    parent: tobiko-tox-infrared
+    nodeset: ubuntu-focal-2-node
+    voting: false
+    description: |
+      Run test cases using tobiko infrared plugin on Ubuntu Focal
+    vars:
+      tox_environment:
+        # This patchset fixes installing IR on Ubuntu Focal and Python 3.8
+        IR_DEPS: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/2"

zuul.d/nodes.yaml

@@ -11,6 +11,19 @@
           - secondary
 
 
+- nodeset:
+    name: ubuntu-focal-2-node
+    nodes:
+      - name: primary
+        label: ubuntu-focal
+      - name: secondary
+        label: ubuntu-focal
+    groups:
+      - name: subnodes
+        nodes:
+          - secondary
+
+
 - nodeset:
     name: openstack-three-node-centos-8
     nodes:

zuul.d/project.yaml

@@ -19,6 +19,7 @@
         - tobiko-devstack-faults-centos-8
         - tobiko-tox-infrared-centos-8
         - tobiko-tox-infrared-ubuntu-bionic
+        - tobiko-tox-infrared-ubuntu-focal
 
     gate:
       jobs: