From 36aff644d24552fe8c8b85e6479df227efd303a4 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Thu, 27 Feb 2020 12:11:28 +0100
Subject: [PATCH] Some fixes required for CentOS 8

This patch is doing some changes related to CentOS8 transition.

- Pre-install python-pyyaml, otherwise is installed with pip at a later
  stage and jobs fail when trying to install from package from CBS
  build.
- Collect dnf related logs
- Use puppet-passed-ci RDO Trunk repo
- Make CentOS 8 jobs voting (we'll remove CentOS7 soon)
- Add CentOS 8 jobs to gate pipeline.

Change-Id: I68a5eb6a547286469e73e57bd6ace02e0aec4532
---
 .zuul.yaml         | 25 ++++++++++++-------------
 run_tests.sh       |  3 ++-
 tools/copy-logs.sh |  4 ++++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d10d055f4..767b955e0 100644
--- a/.zuul.yaml
+++ b/.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:
-            voting: false
-        - packstack-centos8-integration-scenario002:
-            voting: false
-        - packstack-centos8-integration-scenario003:
-            voting: false
-        - packstack-centos8-multinode-scenario002-tempest:
-            voting: false
-        - openstack-tox-py36:
-            voting: false
+        - packstack-centos8-integration-scenario001
+        - packstack-centos8-integration-scenario002
+        - packstack-centos8-integration-scenario003
+        - packstack-centos8-multinode-scenario002-tempest
+        - openstack-tox-py36
     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
diff --git a/run_tests.sh b/run_tests.sh
index 9498c11c4..44b5f454d 100755
--- a/run_tests.sh
+++ b/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 \
diff --git a/tools/copy-logs.sh b/tools/copy-logs.sh
index 276432439..4fc43ef05 100755
--- a/tools/copy-logs.sh
+++ b/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'
     )