openstack/kolla
Code Issues Proposed changes

CI: Move to CentOS 8 nodepool images

Browse Source 
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
This commit is contained in:
Mark Goddard 2019-11-04 10:20:45 +00:00
parent eab2e2b6c1
commit 6c86915597
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.d/base.yaml
View File

@ -26,10 +26,10 @@
C/rWcxTKlGJjjlVFZfhRHHy6gWBYH/SoozkbpkWbk0g43SLSxAuITy7nqLggOU= C/rWcxTKlGJjjlVFZfhRHHy6gWBYH/SoozkbpkWbk0g43SLSxAuITy7nqLggOU=
- nodeset: - nodeset:
name: kolla-centos name: kolla-centos8
nodes: nodes:
- name: primary - name: primary
label: centos-7 label: centos-8
- nodeset: - nodeset:
name: kolla-ubuntu-bionic name: kolla-ubuntu-bionic

4
.zuul.d/centos.yaml
View File

@ -56,7 +56,7 @@
- job: - job:
name: kolla-build-centos-binary name: kolla-build-centos-binary
parent: kolla-base parent: kolla-base
nodeset: kolla-centos nodeset: kolla-centos8
voting: false voting: false
vars: vars:
action: build action: build
@ -75,7 +75,7 @@
- job: - job:
name: kolla-build-centos-source name: kolla-build-centos-source
parent: kolla-base parent: kolla-base
nodeset: kolla-centos nodeset: kolla-centos8
vars: vars:
action: build action: build
base_distro: centos base_distro: centos

4
tests/files/process_build_logs.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python3
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with 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 pkg for pkg in pkg_installs if len(pkg_installs[pkg]) > 10
and not ('base' in pkg_installs[pkg] and not ('base' in pkg_installs[pkg]
or 'openstack-base' in pkg_installs[pkg]) or 'openstack-base' in pkg_installs[pkg])
] ]
if move_to_base_candidates: if move_to_base_candidates:
print("Consider moving the following packages to a base image:") print("Consider moving the following packages to a base image:")

9
tools/setup_RedHat.sh
View File

@ -3,21 +3,16 @@
set -o xtrace set -o xtrace
set -o errexit 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 sudo tee /etc/yum.repos.d/docker-ce-stable.repo << EOF
[docker-ce-stable] [docker-ce-stable]
baseurl=$DOCKER_REPOS_MIRROR_URL/centos/7/\$basearch/stable baseurl=$DOCKER_REPOS_MIRROR_URL/centos/7/\$basearch/stable
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
gpgkey=$DOCKER_REPOS_MIRROR_URL/centos/gpg gpgkey=$DOCKER_REPOS_MIRROR_URL/centos/gpg
module_hotfixes=True
EOF EOF
sudo yum -y install docker-ce python3 sudo dnf -y install docker-ce
# Disable SELinux
setenforce 0
sudo systemctl start docker sudo systemctl start docker
sudo docker info sudo docker info