From 54039b9a10a4008ff07f77546f7869abe00d096d Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 24 Aug 2017 07:52:08 -0400 Subject: [PATCH] Use https for NODEPOOL_RDO_PROXY outside of gate When we changes this in Ia06ebad96c8db2a4eb732e80f04c72ad4c9bc6a3 we switch from https to http. Change this back to https. Change-Id: I8034cc49a9834cc0c1be35ea1fb1b14e4eae3fc6 Related-Bug: #1712785 Signed-off-by: Paul Belanger --- config/release/tripleo-ci/consistent-master.yml | 2 +- config/release/tripleo-ci/consistent-newton.yml | 2 +- config/release/tripleo-ci/consistent-ocata.yml | 2 +- config/release/tripleo-ci/consistent-pike.yml | 2 +- config/release/tripleo-ci/master.yml | 2 +- config/release/tripleo-ci/newton.yml | 2 +- config/release/tripleo-ci/ocata.yml | 2 +- config/release/tripleo-ci/pike.yml | 2 +- config/release/tripleo-ci/promotion-testing-hash-master.yml | 2 +- config/release/tripleo-ci/promotion-testing-hash-newton.yml | 2 +- config/release/tripleo-ci/promotion-testing-hash-ocata.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/release/tripleo-ci/consistent-master.yml b/config/release/tripleo-ci/consistent-master.yml index 76922d77f..28cd1724a 100644 --- a/config/release/tripleo-ci/consistent-master.yml +++ b/config/release/tripleo-ci/consistent-master.yml @@ -29,7 +29,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/consistent/delorean.repo | grep baseurl | cut -d= -f2` if [[ -z "$rdo_dlrn" ]]; then diff --git a/config/release/tripleo-ci/consistent-newton.yml b/config/release/tripleo-ci/consistent-newton.yml index 7bcf6a4cc..d346efa1d 100644 --- a/config/release/tripleo-ci/consistent-newton.yml +++ b/config/release/tripleo-ci/consistent-newton.yml @@ -29,7 +29,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/consistent/delorean.repo | grep baseurl | cut -d= -f2` if [[ -z "$rdo_dlrn" ]]; then diff --git a/config/release/tripleo-ci/consistent-ocata.yml b/config/release/tripleo-ci/consistent-ocata.yml index 6f3c1c2b9..8f17b3631 100644 --- a/config/release/tripleo-ci/consistent-ocata.yml +++ b/config/release/tripleo-ci/consistent-ocata.yml @@ -29,7 +29,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/consistent/delorean.repo | grep baseurl | cut -d= -f2` if [[ -z "$rdo_dlrn" ]]; then diff --git a/config/release/tripleo-ci/consistent-pike.yml b/config/release/tripleo-ci/consistent-pike.yml index 21614767b..73b826319 100644 --- a/config/release/tripleo-ci/consistent-pike.yml +++ b/config/release/tripleo-ci/consistent-pike.yml @@ -29,7 +29,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/consistent/delorean.repo | grep baseurl | cut -d= -f2` if [[ -z "$rdo_dlrn" ]]; then diff --git a/config/release/tripleo-ci/master.yml b/config/release/tripleo-ci/master.yml index 09e52e782..27c86cda8 100644 --- a/config/release/tripleo-ci/master.yml +++ b/config/release/tripleo-ci/master.yml @@ -28,7 +28,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/current/delorean.repo | grep baseurl | cut -d= -f2` tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/current-tripleo/delorean.repo | grep baseurl | cut -d= -f2` diff --git a/config/release/tripleo-ci/newton.yml b/config/release/tripleo-ci/newton.yml index a986f7cbb..1888519df 100644 --- a/config/release/tripleo-ci/newton.yml +++ b/config/release/tripleo-ci/newton.yml @@ -29,7 +29,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/current/delorean.repo | grep baseurl | cut -d= -f2` if [[ -z "$rdo_dlrn" ]]; then diff --git a/config/release/tripleo-ci/ocata.yml b/config/release/tripleo-ci/ocata.yml index 0b873a8b5..a6059089d 100644 --- a/config/release/tripleo-ci/ocata.yml +++ b/config/release/tripleo-ci/ocata.yml @@ -29,7 +29,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/current/delorean.repo | grep baseurl | cut -d= -f2` if [[ -z "$rdo_dlrn" ]]; then diff --git a/config/release/tripleo-ci/pike.yml b/config/release/tripleo-ci/pike.yml index 51d0539cc..a8131941d 100644 --- a/config/release/tripleo-ci/pike.yml +++ b/config/release/tripleo-ci/pike.yml @@ -29,7 +29,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/current/delorean.repo | grep baseurl | cut -d= -f2` if [[ -z "$rdo_dlrn" ]]; then diff --git a/config/release/tripleo-ci/promotion-testing-hash-master.yml b/config/release/tripleo-ci/promotion-testing-hash-master.yml index ecead0041..0f6a73d78 100644 --- a/config/release/tripleo-ci/promotion-testing-hash-master.yml +++ b/config/release/tripleo-ci/promotion-testing-hash-master.yml @@ -36,7 +36,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/tripleo-ci-testing/delorean.repo | grep baseurl | cut -d= -f2` rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/delorean-deps.repo | grep baseurl | cut -d= -f2` diff --git a/config/release/tripleo-ci/promotion-testing-hash-newton.yml b/config/release/tripleo-ci/promotion-testing-hash-newton.yml index d90972c01..2c8fd43f9 100644 --- a/config/release/tripleo-ci/promotion-testing-hash-newton.yml +++ b/config/release/tripleo-ci/promotion-testing-hash-newton.yml @@ -36,7 +36,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/tripleo-ci-testing/delorean.repo | grep baseurl | cut -d= -f2` rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/delorean-deps.repo | grep baseurl | cut -d= -f2` diff --git a/config/release/tripleo-ci/promotion-testing-hash-ocata.yml b/config/release/tripleo-ci/promotion-testing-hash-ocata.yml index b0c59bbc6..6cbcce0f7 100644 --- a/config/release/tripleo-ci/promotion-testing-hash-ocata.yml +++ b/config/release/tripleo-ci/promotion-testing-hash-ocata.yml @@ -36,7 +36,7 @@ repo_cmd_before: | # Otherwise, fallback to official mirrors provided by CentOS. export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org - export NODEPOOL_RDO_PROXY=http://trunk.rdoproject.org + export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/tripleo-ci-testing/delorean.repo | grep baseurl | cut -d= -f2` rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/delorean-deps.repo | grep baseurl | cut -d= -f2`