From 6c86915597c00da845bbfa433e897b1573f50c70 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 4 Nov 2019 10:20:45 +0000
Subject: [PATCH] CI: Move to CentOS 8 nodepool images

This change modifies the CentOS build CI jobs to use a CentOS 8 host
image.

NOTE: This does not affect the version of CentOS used as the base image
in containers built by kolla.

Partially-Implements: blueprint centos-rhel-8
Partially-Implements: blueprint centos-rhel-python3

Change-Id: Ie25b54a4e6116ed2bcb9c3b5c44eb6edbd2e6b49
---
 .zuul.d/base.yaml                 | 4 ++--
 .zuul.d/centos.yaml               | 4 ++--
 tests/files/process_build_logs.py | 4 ++--
 tools/setup_RedHat.sh             | 9 ++-------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 1443927a43..1cd97d282c 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -26,10 +26,10 @@
           C/rWcxTKlGJjjlVFZfhRHHy6gWBYH/SoozkbpkWbk0g43SLSxAuITy7nqLggOU=
 
 - nodeset:
-    name: kolla-centos
+    name: kolla-centos8
     nodes:
       - name: primary
-        label: centos-7
+        label: centos-8
 
 - nodeset:
     name: kolla-ubuntu-bionic
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index 9910aade01..fbb50c99f9 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -56,7 +56,7 @@
 - job:
     name: kolla-build-centos-binary
     parent: kolla-base
-    nodeset: kolla-centos
+    nodeset: kolla-centos8
     voting: false
     vars:
       action: build
@@ -75,7 +75,7 @@
 - job:
     name: kolla-build-centos-source
     parent: kolla-base
-    nodeset: kolla-centos
+    nodeset: kolla-centos8
     vars:
       action: build
       base_distro: centos
diff --git a/tests/files/process_build_logs.py b/tests/files/process_build_logs.py
index 9962dbbf83..f05cd81e99 100755
--- a/tests/files/process_build_logs.py
+++ b/tests/files/process_build_logs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ move_to_base_candidates = [
     pkg for pkg in pkg_installs if len(pkg_installs[pkg]) > 10
     and not ('base' in pkg_installs[pkg]
              or 'openstack-base' in pkg_installs[pkg])
-    ]
+]
 
 if move_to_base_candidates:
     print("Consider moving the following packages to a base image:")
diff --git a/tools/setup_RedHat.sh b/tools/setup_RedHat.sh
index 465944194f..50cd81ff46 100755
--- a/tools/setup_RedHat.sh
+++ b/tools/setup_RedHat.sh
@@ -3,21 +3,16 @@
 set -o xtrace
 set -o errexit
 
-# (SamYaple)TODO: Remove the path overriding
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
 sudo tee /etc/yum.repos.d/docker-ce-stable.repo << EOF
 [docker-ce-stable]
 baseurl=$DOCKER_REPOS_MIRROR_URL/centos/7/\$basearch/stable
 enabled=1
 gpgcheck=1
 gpgkey=$DOCKER_REPOS_MIRROR_URL/centos/gpg
+module_hotfixes=True
 EOF
 
-sudo yum -y install docker-ce python3
-
-# Disable SELinux
-setenforce 0
+sudo dnf -y install docker-ce
 
 sudo systemctl start docker
 sudo docker info