From 2c10fdf2b3ad638105ebb07082959c22948096ca Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 22 Sep 2020 11:22:59 -0700
Subject: Update gate jobs

* Add py38 job
* Add py36-on-centos8 job

Change-Id: I020afad0bfe5144786bb8b6e1a99386f8c78a908
---
 .zuul.yaml          | 15 ++++++++++++---
 bindep.txt          |  6 ++++--
 tools/test-setup.sh | 12 ++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index cd7efad..65f87bc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,7 +6,9 @@
         - openstack-tox-py35
         - openstack-tox-py36
         - openstack-tox-py37
+        - openstack-tox-py38
         - pyeclib-tox-py27-centos-7
+        - pyeclib-tox-py36-centos-8
         - libec-pyeclib-unit-centos-7
         - libec-pyeclib-unit
     gate:
@@ -14,16 +16,23 @@
         - openstack-tox-py35
         - openstack-tox-py36
         - openstack-tox-py37
+        - openstack-tox-py38
         - pyeclib-tox-py27-centos-7
+        - pyeclib-tox-py36-centos-8
 
 - job:
     name: pyeclib-tox-py27-centos-7
-    parent: openstack-tox
+    parent: openstack-tox-py27
     description: |
       Run unit tests using ``py27`` environment on CentOS 7.
     nodeset: centos-7
-    vars:
-      tox_envlist: py27
+
+- job:
+    name: pyeclib-tox-py36-centos-8
+    parent: openstack-tox-py36
+    description: |
+      Run unit tests using ``py36`` environment on CentOS 8.
+    nodeset: centos-8
 
 - job:
     name: libec-pyeclib-unit-centos-7
diff --git a/bindep.txt b/bindep.txt
index aff20c4..f45d4c2 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -12,7 +12,9 @@ yasm [!platform:centos]
 liberasurecode-dev [platform:dpkg]
 # There's no library in CentOS 7 but Fedora and openSUSE have it.
 liberasurecode-devel [platform:rpm !platform:centos]
-python-dev [platform:dpkg]
-python-devel [platform:rpm]
+python-dev [(platform:dpkg py27)]
+python3-dev [(platform:dpkg !py27)]
+python-devel [(platform:rpm py27)]
+python3-devel [(platform:rpm !py27)]
 zlib-devel [platform:rpm]
 zlib1g-dev [platform:dpkg]
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 152dc58..926a1d6 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -10,6 +10,11 @@ function is_rhel7 {
         cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
         cat /etc/*release | grep -q 'release 7'
 }
+function is_rhel8 {
+    [ -f /usr/bin/dnf ] && \
+        cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
+        cat /etc/*release | grep -q 'release 8'
+}
 
 
 if is_rhel7; then
@@ -20,3 +25,10 @@ if is_rhel7; then
     # packages.
     sudo yum install -y liberasurecode-devel yasm
 fi
+
+if is_rhel8; then
+    # Install CentOS OpenStack repos so that we have access to some extra
+    # packages.
+    sudo dnf install -y centos-release-openstack-ussuri
+    sudo dnf install -y liberasurecode-devel yasm
+fi
-- 
cgit v1.2.1