openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Merge "Clean up logic for CentOS 8"

This commit is contained in:
Zuul 2022-09-07 19:14:50 +00:00 committed by Gerrit Code Review
parent 265ac2d5ed 0cc2002481
commit 055313cb8b
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure_facts.sh
View File

@ -30,30 +30,17 @@ source $SCRIPT_DIR/functions
if [ -f /etc/ci/mirror_info.sh ]; then
source /etc/ci/mirror_info.sh
if [ "${OS_NAME_VERS}" == "centos9" ]; then
CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/centos-stream"
else
CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}"
fi
CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/centos-stream"
DEPS_MIRROR_HOST="${NODEPOOL_RDO_PROXY}/${DLRN_DEPS_BASE}/"
if uses_debs; then
CEPH_MIRROR_HOST="http://download.ceph.com/debian-${CEPH_VERSION}"
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs"
else
if [ "${OS_NAME_VERS}" == "centos9" ]; then
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
else
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
fi
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"
fi
else
if [ "${OS_NAME_VERS}" == "centos9" ]; then
CENTOS_MIRROR_HOST='http://mirror.stream.centos.org'
else
CENTOS_MIRROR_HOST='http://mirror.centos.org'
fi
CENTOS_MIRROR_HOST='http://mirror.stream.centos.org'
DEPS_MIRROR_HOST="https://trunk.rdoproject.org/${DLRN_DEPS_BASE}/"
NODEPOOL_RDO_PROXY='https://trunk.rdoproject.org'
NODEPOOL_UCA_MIRROR='http://ubuntu-cloud.archive.canonical.com/ubuntu'
@ -61,11 +48,7 @@ else
CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}"
NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com'
else
if [ "${OS_NAME_VERS}" == "centos9" ]; then
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
else
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/centos/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
fi
CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"
NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com"
fi
fi

2
run_tests.sh
View File

@ -18,7 +18,7 @@ source ${SCRIPT_DIR}/functions
export WORKSPACE=${WORKSPACE:-/tmp}
export CEPH_VERSION=${CEPH_VERSION:-pacific}
export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-5}
export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-6}
export SCENARIO=${SCENARIO:-scenario001}
export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}
export MANAGE_REPOS=${MANAGE_REPOS:-true}