diff --git a/manifests/repos.pp b/manifests/repos.pp index c1e0558e4..b2c4ea10a 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -22,7 +22,7 @@ class openstack_integration::repos { manage_epel => false, repo_hash => { 'pike-puppet-passed-ci' => { - 'baseurl' => 'https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/', + 'baseurl' => $::rdo_mirror_host, 'descr' => 'Pike puppet-passed-ci', 'gpgcheck' => 'no', 'priority' => 1, diff --git a/run_tests.sh b/run_tests.sh index 7b0896c05..08f39203b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -36,6 +36,8 @@ export TEMPEST_FROM_SOURCE=${TEMPEST_FROM_SOURCE:-true} # Cirros Image directory export IMG_DIR=${IMG_DIR:-'/tmp/openstack/image'} +RDO_MIRROR_HOST=`curl --silent https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/delorean.repo | grep baseurl | cut -d= -f2` + # NOTE(pabelanger): Setup facter to know about AFS mirror. if [ -f /etc/nodepool/provider ]; then source /etc/nodepool/provider @@ -44,6 +46,7 @@ if [ -f /etc/nodepool/provider ]; then NODEPOOL_MIRROR_HOST="http://$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')" CENTOS_MIRROR_HOST=${NODEPOOL_MIRROR_HOST} UCA_MIRROR_HOST="${NODEPOOL_MIRROR_HOST}/ubuntu-cloud-archive" + RDO_MIRROR_HOST=${RDO_MIRROR_HOST/https:\/\/trunk.rdoproject.org/$NODEPOOL_MIRROR_HOST:8080/rdo} if uses_debs; then CEPH_MIRROR_HOST="${NODEPOOL_MIRROR_HOST}/ceph-deb-jewel" else @@ -61,6 +64,7 @@ fi export FACTER_centos_mirror_host=$CENTOS_MIRROR_HOST export FACTER_uca_mirror_host=$UCA_MIRROR_HOST export FACTER_ceph_mirror_host=$CEPH_MIRROR_HOST +export FACTER_rdo_mirror_host=$RDO_MIRROR_HOST if [ $PUPPET_MAJ_VERSION == 4 ]; then export PATH=${PATH}:/opt/puppetlabs/bin