diff --git a/config/release/tripleo-ci/CentOS-7/consistent-master.yml b/config/release/tripleo-ci/CentOS-7/consistent-master.yml index 49abfccda..08594dc32 100644 --- a/config/release/tripleo-ci/CentOS-7/consistent-master.yml +++ b/config/release/tripleo-ci/CentOS-7/consistent-master.yml @@ -33,7 +33,6 @@ repo_cmd_before: | else # 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_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo -S 2>>~/dlrn_repo_curl_errors.log | grep baseurl | cut -d= -f2` @@ -92,11 +91,6 @@ 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/CentOS-7/master-undercloud-rocky-overcloud.yml b/config/release/tripleo-ci/CentOS-7/master-undercloud-rocky-overcloud.yml index 38a67a132..cec08924b 100644 --- a/config/release/tripleo-ci/CentOS-7/master-undercloud-rocky-overcloud.yml +++ b/config/release/tripleo-ci/CentOS-7/master-undercloud-rocky-overcloud.yml @@ -47,7 +47,6 @@ repo_cmd_before: | else # 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_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` @@ -127,11 +126,6 @@ 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/CentOS-7/master.yml b/config/release/tripleo-ci/CentOS-7/master.yml index 538fad362..107d1f5e3 100644 --- a/config/release/tripleo-ci/CentOS-7/master.yml +++ b/config/release/tripleo-ci/CentOS-7/master.yml @@ -32,7 +32,6 @@ repo_cmd_before: | else # 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_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` @@ -114,11 +113,6 @@ 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/CentOS-7/promotion-testing-hash-master.yml b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-master.yml index bc10d4fe7..4c0610e54 100644 --- a/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-master.yml +++ b/config/release/tripleo-ci/CentOS-7/promotion-testing-hash-master.yml @@ -33,7 +33,6 @@ repo_cmd_before: | else # 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_RDO_PROXY=https://trunk.rdoproject.org fi rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo -S 2>>~/dlrn_repo_curl_errors.log | grep baseurl | cut -d= -f2` @@ -98,11 +97,6 @@ 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;