openstack/puppet-openstack-integration
Code Issues Proposed changes

Add support for RDO CentOS8 repos and run CentOS8 jobs

Browse Source 
Initially these jobs will be running as non-voting,
once stabilized will be moved to voting.

RDO with CentOS8 has moved to component based repos[1],
where for each component have it's own repo, the list
of component can grow/shrink with time so instead of
using base path to configure repo, pull repo files
directly and adjust proxy.

[1] https://review.rdoproject.org/r/#/c/22394/

Change-Id: I1de859f29c933d895fb5cd2b7f1897517e11385c
(cherry picked from commit 8cb0744208)
This commit is contained in:
yatinkarel
2019-12-18 20:44:35 +05:30
committed by Alfredo Moralejo
parent 926c0fd193
commit f1a830159a
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure_facts.sh
View File

@@ -18,8 +18,10 @@ OS_NAME_VERS=${REDHAT_SUPPORT_PRODUCT}${REDHAT_SUPPORT_PRODUCT_VERSION}
# Write out facts to the facter folder when we generate them.
export WRITE_FACTS=${WRITE_FACTS:-true}
export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-train/current-passed-ci}
export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-train/puppet-passed-ci}
export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-train/deps/latest/}
export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-train/puppet-passed-ci/delorean.repo}
export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-train/delorean-deps.repo}
export CEPH_VERSION=${CEPH_VERSION:-nautilus}
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)

18
run_tests.sh
View File

@@ -202,11 +202,19 @@ fi
set +e
if [ "${MANAGE_REPOS}" = true ]; then
print_header 'Install repos'
$SUDO $PUPPET_FULL_PATH apply $PUPPET_ARGS -e "include ::openstack_integration::repos"
RESULT=$?
if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then
print_header 'Puppet failed to install repositories.'
exit 1
if [[ "${REDHAT_SUPPORT_PRODUCT,,}" = "centos" && ${REDHAT_SUPPORT_PRODUCT_VERSION} = "8" ]]; then
$SUDO curl -o /etc/yum.repos.d/delorean.repo ${NODEPOOL_RDO_PROXY}/${DLRN_BASE_URL}
$SUDO sed -i "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|" /etc/yum.repos.d/delorean.repo
$SUDO curl -o /etc/yum.repos.d/delorean-deps.repo ${NODEPOOL_RDO_PROXY}/${DLRN_DEPS_URL}
$SUDO sed -i "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|" /etc/yum.repos.d/delorean-deps.repo
RESULT=$?
else
$SUDO $PUPPET_FULL_PATH apply $PUPPET_ARGS -e "include openstack_integration::repos"
RESULT=$?
if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then
print_header 'Puppet failed to install repositories.'
exit 1
fi
fi
print_header 'Updating packages'
if is_fedora; then

16
zuul.d/layout.yaml
View File

@@ -62,6 +62,14 @@
- puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
- puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
- puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
- puppet-openstack-integration-5-scenario001-tempest-centos-8:
voting: false
- puppet-openstack-integration-5-scenario002-tempest-centos-8:
voting: false
- puppet-openstack-integration-5-scenario003-tempest-centos-8:
voting: false
- puppet-openstack-integration-5-scenario004-tempest-centos-8:
voting: false
gate:
jobs:
- puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
@@ -101,6 +109,8 @@
jobs:
- puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
- puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous
- puppet-openstack-integration-5-scenario001-tempest-centos-8:
voting: false
gate:
jobs:
- puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic
@@ -120,6 +130,8 @@
jobs:
- puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
- puppet-openstack-integration-5-scenario002-tempest-centos-7
- puppet-openstack-integration-5-scenario002-tempest-centos-8:
voting: false
gate:
jobs:
- puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic
@@ -139,6 +151,8 @@
jobs:
- puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic
- puppet-openstack-integration-5-scenario003-tempest-centos-7
- puppet-openstack-integration-5-scenario003-tempest-centos-8:
voting: false
gate:
jobs:
- puppet-openstack-integration-5-scenario003-tempest-centos-7
@@ -157,6 +171,8 @@
jobs:
- puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic
- puppet-openstack-integration-5-scenario004-tempest-centos-7-nautilus
- puppet-openstack-integration-5-scenario004-tempest-centos-8:
voting: false
gate:
jobs:
- puppet-openstack-integration-5-scenario004-tempest-centos-7-nautilus