Merge "Revert "Revert "Enable virt7-container-common-candidate repo starting in Stein"""

config/release/tripleo-ci/master.yml

@@ -32,6 +32,7 @@ repo_cmd_before: |
     # Otherwise, fallback to official mirrors provided by CentOS.
     export NODEPOOL_CENTOS_MIRROR={{ lookup('env','NODEPOOL_CENTOS_MIRROR')|default('http://mirror.centos.org/centos', true) }}
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
+    export NODEPOOL_CBS_CENTOS_PROXY=https://cbs.centos.org/repos
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
   rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest, true) }}/delorean.repo -S 2>>~/dlrn_repo_curl_errors.log | grep baseurl | cut -d= -f2`
@@ -113,6 +114,11 @@ repos:
     filename: quickstart-centos-opstools.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/opstools/x86_64/
 
+  - type: generic
+    reponame: quickstart-centos-virt7-container-common-candidate
+    filename: quickstart-centos-virt7-container-common-candidate.repo
+    baseurl: ${NODEPOOL_CBS_CENTOS_PROXY}/virt7-container-common-candidate/x86_64/os/
+
 repo_cmd_after: |
   sudo yum install -y yum-plugin-priorities;
   {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt quickstart-centos-opstools.enabled=0;