Fix repos for promotion jobs
Fix stable branch jobs to use consistent repos instead of current in promotion job. Fix master jobs not to use current-tripleo repo in promotion. Change-Id: I72c448a5257afa0aa2a7d166e52cd11d0e03582c
This commit is contained in:
parent
c6c3a211ca
commit
d04632d71b
|
@ -158,6 +158,7 @@ OVERCLOUD_PINGTEST=${OVERCLOUD_PINGTEST:-""}
|
||||||
UNDERCLOUD_SANITY_CHECK=${UNDERCLOUD_SANITY_CHECK:-""}
|
UNDERCLOUD_SANITY_CHECK=${UNDERCLOUD_SANITY_CHECK:-""}
|
||||||
REPO_SETUP=${REPO_SETUP:-""}
|
REPO_SETUP=${REPO_SETUP:-""}
|
||||||
REPO_PREFIX=${REPO_PREFIX:-"/etc/yum.repos.d/"}
|
REPO_PREFIX=${REPO_PREFIX:-"/etc/yum.repos.d/"}
|
||||||
|
CACHEUPLOAD=${CACHEUPLOAD:-"0"}
|
||||||
OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF:-"\
|
OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF:-"\
|
||||||
$REPO_PREFIX/delorean.repo \
|
$REPO_PREFIX/delorean.repo \
|
||||||
$REPO_PREFIX/delorean-current.repo \
|
$REPO_PREFIX/delorean-current.repo \
|
||||||
|
@ -322,15 +323,20 @@ EOF"
|
||||||
sudo sed -i -e "s~https://trunk.rdoproject.org~$NODEPOOL_RDO_PROXY~" $REPO_PREFIX/delorean.repo
|
sudo sed -i -e "s~https://trunk.rdoproject.org~$NODEPOOL_RDO_PROXY~" $REPO_PREFIX/delorean.repo
|
||||||
cat $REPO_PREFIX/delorean.repo
|
cat $REPO_PREFIX/delorean.repo
|
||||||
|
|
||||||
# Enable latest RDO Trunk Delorean repository
|
# Enable latest RDO Trunk Delorean repository if not promotion job
|
||||||
sudo curl -Lvo $REPO_PREFIX/delorean-current.repo https://trunk.rdoproject.org/centos7/current/delorean.repo
|
if [[ $CACHEUPLOAD != 1 ]]; then
|
||||||
sudo sed -i -e 's%priority=.*%priority=10%' $REPO_PREFIX/delorean-current.repo
|
sudo curl -Lvo $REPO_PREFIX/delorean-current.repo https://trunk.rdoproject.org/centos7/current/delorean.repo
|
||||||
sudo sed -i 's/\[delorean\]/\[delorean-current\]/' $REPO_PREFIX/delorean-current.repo
|
sudo sed -i -e 's%priority=.*%priority=10%' $REPO_PREFIX/delorean-current.repo
|
||||||
sudo sed -i -e "s~https://trunk.rdoproject.org~$NODEPOOL_RDO_PROXY~" $REPO_PREFIX/delorean-current.repo
|
sudo sed -i 's/\[delorean\]/\[delorean-current\]/' $REPO_PREFIX/delorean-current.repo
|
||||||
sudo /bin/bash -c "cat <<-EOF>>$REPO_PREFIX/delorean-current.repo
|
sudo sed -i -e "s~https://trunk.rdoproject.org~$NODEPOOL_RDO_PROXY~" $REPO_PREFIX/delorean-current.repo
|
||||||
|
sudo /bin/bash -c "cat <<-EOF>>$REPO_PREFIX/delorean-current.repo
|
||||||
|
|
||||||
includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-common,openstack-tripleo-heat-templates,openstack-tripleo-image-elements,openstack-tripleo,openstack-tripleo-puppet-elements,openstack-puppet-modules,openstack-tripleo-ui,puppet-*
|
includepkgs=diskimage-builder,instack,instack-undercloud,os-apply-config,os-collect-config,os-net-config,os-refresh-config,python-tripleoclient,openstack-tripleo-common,openstack-tripleo-heat-templates,openstack-tripleo-image-elements,openstack-tripleo,openstack-tripleo-puppet-elements,openstack-puppet-modules,openstack-tripleo-ui,puppet-*
|
||||||
EOF"
|
EOF"
|
||||||
|
else
|
||||||
|
# Create empty delorean-current for dib image building
|
||||||
|
sudo sh -c "> $REPO_PREFIX/delorean-current.repo"
|
||||||
|
fi
|
||||||
cat $REPO_PREFIX/delorean-current.repo
|
cat $REPO_PREFIX/delorean-current.repo
|
||||||
else
|
else
|
||||||
# Enable the Delorean Deps repository
|
# Enable the Delorean Deps repository
|
||||||
|
|
|
@ -309,6 +309,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
;;
|
;;
|
||||||
periodic)
|
periodic)
|
||||||
export DELOREAN_REPO_URL=https://trunk.rdoproject.org/centos7/consistent
|
export DELOREAN_REPO_URL=https://trunk.rdoproject.org/centos7/consistent
|
||||||
|
export DELOREAN_STABLE_REPO_URL=https://trunk.rdoproject.org/centos7-$STABLE_RELEASE/consistent/
|
||||||
CACHEUPLOAD=1
|
CACHEUPLOAD=1
|
||||||
OVERCLOUD_PINGTEST_ARGS=
|
OVERCLOUD_PINGTEST_ARGS=
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue