Switch trunk/cbs/buildlogs to use https

There is a permanent redirection from http to https in buildlogs, cbs
and trunk repos that might create issues when the redirection fails for
some reasons.
Let's use https directly.

Also remove Liberty case, since it's EOL.

Change-Id: I3946a3bc8dce4ff2961fb7850c4ee1867661b1f6
This commit is contained in:
Emilien Macchi 2017-03-21 08:24:16 -04:00
parent e16332b181
commit 69cd1baf45
1 changed files with 3 additions and 5 deletions

View File

@ -110,12 +110,10 @@
export USE_DELOREAN_TRUNK=1
export DELOREAN_REPO_FILE="delorean.repo"
if [ "$ZUUL_BRANCH" == "stable/liberty" ]; then
export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7-liberty/current/"
elif [ "$ZUUL_BRANCH" == "stable/mitaka" ]; then
export DELOREAN_TRUNK_REPO="http://trunk.rdoproject.org/centos7-mitaka/current/"
if [ "$ZUUL_BRANCH" == "stable/mitaka" ]; then
export DELOREAN_TRUNK_REPO="https://trunk.rdoproject.org/centos7-mitaka/current/"
else
export DELOREAN_TRUNK_REPO="http://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/"
export DELOREAN_TRUNK_REPO="https://buildlogs.centos.org/centos/7/cloud/x86_64/rdo-trunk-master-tripleo/"
fi
tox -evenv -- pip install $WORKSPACE/diskimage-builder