Merge branch 'Katello:master' into pablomh-concurrency

.github/workflows/main.yml

@@ -13,7 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["2.7", "3.8"]
+        python:
+          - "3.8"
+          - "3.9"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
@@ -36,7 +38,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        centos: ["7", "stream8"]
+        centos:
+          - stream8
+          - stream9
     container:
       image: quay.io/centos/centos:${{ matrix.centos }}
     steps:

test.sh

@@ -4,22 +4,17 @@ set -e
 
 export LC_ALL=en_US.UTF-8
 
-TEST_ON_EL=$([ -f /etc/redhat-release ] && [ -x /usr/bin/yum ] && echo "true" || echo "false")
-PYTHON=python
+PYTHON=python3
 
-if [[ "${TEST_ON_EL}" == "true" ]]; then
+if [[ -f /etc/redhat-release ]]; then
   . /etc/os-release
   if [[ $VERSION_ID == 8 ]] ; then
-    # TODO: where's docbook-utils on EL8?
-    PACKAGES="python3 python3-setuptools"
-    PYTHON="python3"
-    # This is where Python 3 on EL8 installs packages to
-    mkdir -p /usr/local/lib/python3.6/site-packages
-  elif [[ $VERSION_ID == 7 ]] ; then
-    PACKAGES="docbook-utils python-setuptools"
+    REPOS="--enablerepo=powertools"
+  else
+    REPOS=""
   fi
 
-  yum install -y openssl rpm-build tree $PACKAGES
+  dnf install ${REPOS} -y openssl rpm-build tree python3 python3-setuptools docbook-utils glibc-langpack-en
 fi
 
 if [[ -x /usr/bin/docbook2man ]] ; then