tripleo-ci/master: add virt7-container-common-candidate

Add virt7-container-common-candidate repos everywhere master is being tested. Change-Id: Id7b42b5a64e8db333dfd12501134534a889d6c71 Signed-off-by: Emilien Macchi <emilien@redhat.com>
openstack-archive · Sep 18, 2018 · 3b50f4d · 3b50f4d
1 parent 77f9955
commit 3b50f4d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/config/release/tripleo-ci/consistent-master.yml b/config/release/tripleo-ci/consistent-master.yml
@@ -88,6 +88,11 @@ repos:
     filename: quickstart-centos-opstools.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/opstools/x86_64/
 
+  - type: generic
+    reponame: quickstart-centos-virt7-container-testing
+    filename: quickstart-centos-virt7-container-testing.repo
+    baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/virt/x86_64/container/
+
 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;

diff --git a/config/release/tripleo-ci/master-undercloud-rocky-overcloud.yml b/config/release/tripleo-ci/master-undercloud-rocky-overcloud.yml
@@ -127,6 +127,11 @@ repos:
     filename: quickstart-centos-opstools.repo
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/opstools/x86_64/
 
+  - type: generic
+    reponame: quickstart-centos-virt7-container-testing
+    filename: quickstart-centos-virt7-container-testing.repo
+    baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/virt/x86_64/container/
+
 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;

diff --git a/config/release/tripleo-ci/master.yml b/config/release/tripleo-ci/master.yml
@@ -33,7 +33,6 @@ 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`

diff --git a/config/release/tripleo-ci/promotion-testing-hash-master.yml b/config/release/tripleo-ci/promotion-testing-hash-master.yml
@@ -94,6 +94,11 @@ repos:
     baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/cr/x86_64/
     enabled: 0
 
+  - type: generic
+    reponame: quickstart-centos-virt7-container-testing
+    filename: quickstart-centos-virt7-container-testing.repo
+    baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/virt/x86_64/container/
+
 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;