Merge "Some fixes required for CentOS 8"

.zuul.yaml

@@ -48,7 +48,7 @@
     parent: packstack-base
     vars:
       selinux_enforcing: "false"
-      delorean: "https://trunk.rdoproject.org/centos8-master/consistent/delorean.repo"
+      delorean: "https://trunk.rdoproject.org/centos8-master/puppet-passed-ci/delorean.repo"
       delorean_deps: "https://trunk.rdoproject.org/centos8-master/delorean-deps.repo"
     pre-run: playbooks/packstack-centos8-pre.yaml
     nodeset:
@@ -74,7 +74,7 @@
     parent: packstack-base
     vars:
       selinux_enforcing: "false"
-      delorean: "https://trunk.rdoproject.org/centos8-master/consistent/delorean.repo"
+      delorean: "https://trunk.rdoproject.org/centos8-master/puppet-passed-ci/delorean.repo"
       delorean_deps: "https://trunk.rdoproject.org/centos8-master/delorean-deps.repo"
     pre-run: playbooks/packstack-centos8-pre.yaml
     nodeset:
@@ -224,23 +224,22 @@
         - packstack-integration-scenario002-tempest
         - packstack-integration-scenario003-tempest
         - packstack-multinode-scenario002-tempest
-        # We can't make centos8 jobs voting until we have promotion pipeline
+        - packstack-centos8-integration-scenario001
-        - packstack-centos8-integration-scenario001:
+        - packstack-centos8-integration-scenario002
-            voting: false
+        - packstack-centos8-integration-scenario003
-        - packstack-centos8-integration-scenario002:
+        - packstack-centos8-multinode-scenario002-tempest
-            voting: false
+        - openstack-tox-py36
-        - packstack-centos8-integration-scenario003:
-            voting: false
-        - packstack-centos8-multinode-scenario002-tempest:
-            voting: false
-        - openstack-tox-py36:
-            voting: false
     gate:
       jobs:
         - packstack-integration-scenario001-tempest
         - packstack-integration-scenario002-tempest
         - packstack-integration-scenario003-tempest
         - packstack-multinode-scenario002-tempest
+        - packstack-centos8-integration-scenario001
+        - packstack-centos8-integration-scenario002
+        - packstack-centos8-integration-scenario003
+        - packstack-centos8-multinode-scenario002-tempest
+        - openstack-tox-py36
     post:
       jobs:
         - packstack-upload-git-mirror

run_tests.sh

@@ -178,7 +178,8 @@ OS_VERSION=$(facter operatingsystemmajrelease)
 
 if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 7 ]; then
     $SUDO $PKG_MGR -y install python3-setuptools \
-                              python3-devel
+                              python3-devel \
+                              python3-pyyaml
 else
     $SUDO $PKG_MGR -y install python-setuptools \
                               python-devel \

tools/copy-logs.sh

@@ -103,6 +103,7 @@ function get_config_and_logs {
         '/etc/my.cnf.d'
         '/var/log/mariadb'
         '/etc/httpd/conf.d/'
+        '/etc/yum.repos.d/'
         '/var/log/httpd'
         '/var/tmp/packstack/latest'
         '/var/tmp/packstack/latest/testrepository.subunit' # So we're copying it
@@ -110,6 +111,9 @@ function get_config_and_logs {
         '/var/log/secure'                                  # /logs
         '/var/log/messages'
         '/var/log/dstat.log'
+        '/var/log/dnf.log'
+        '/var/log/dnf.rpm.log'
+        '/var/log/dnf.librepo.log'
         '/etc/puppet/puppet.conf'
         '/etc/puppet/hiera.yaml'
     )