Merge "Switch trunk/cbs/buildlogs to use https"

This commit is contained in:
Jenkins 2017-03-28 13:48:59 +00:00 committed by Gerrit Code Review
commit 1273381062

View File

@ -14,11 +14,11 @@ else
# should help avoid unwanted differences between containerized and # should help avoid unwanted differences between containerized and
# non-containerized trunk software sources. # non-containerized trunk software sources.
REPO_PREFIX=/etc/yum.repos.d REPO_PREFIX=/etc/yum.repos.d
DELOREAN_REPO_URL=http://trunk.rdoproject.org/centos7/current-tripleo/ DELOREAN_REPO_URL=https://trunk.rdoproject.org/centos7/current-tripleo/
DELOREAN_REPO_FILE=delorean.repo DELOREAN_REPO_FILE=delorean.repo
# Enable the Delorean Deps repository # Enable the Delorean Deps repository
curl -Lvo $REPO_PREFIX/delorean-deps.repo http://trunk.rdoproject.org/centos7/delorean-deps.repo curl -Lvo $REPO_PREFIX/delorean-deps.repo https://trunk.rdoproject.org/centos7/delorean-deps.repo
sed -i -e 's%priority=.*%priority=30%' $REPO_PREFIX/delorean-deps.repo sed -i -e 's%priority=.*%priority=30%' $REPO_PREFIX/delorean-deps.repo
cat $REPO_PREFIX/delorean-deps.repo cat $REPO_PREFIX/delorean-deps.repo
@ -28,7 +28,7 @@ else
cat $REPO_PREFIX/delorean.repo cat $REPO_PREFIX/delorean.repo
# Enable latest RDO Trunk Delorean repository # Enable latest RDO Trunk Delorean repository
curl -Lvo $REPO_PREFIX/delorean-current.repo http://trunk.rdoproject.org/centos7/current/delorean.repo curl -Lvo $REPO_PREFIX/delorean-current.repo https://trunk.rdoproject.org/centos7/current/delorean.repo
sed -i -e 's%priority=.*%priority=10%' $REPO_PREFIX/delorean-current.repo sed -i -e 's%priority=.*%priority=10%' $REPO_PREFIX/delorean-current.repo
sed -i 's/\[delorean\]/\[delorean-current\]/' $REPO_PREFIX/delorean-current.repo sed -i 's/\[delorean\]/\[delorean-current\]/' $REPO_PREFIX/delorean-current.repo
/bin/bash -c "cat <<-EOF>>$REPO_PREFIX/delorean-current.repo /bin/bash -c "cat <<-EOF>>$REPO_PREFIX/delorean-current.repo