From 84e0168e49fce2f3d79559866ebea8f7050eef51 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 9 Aug 2017 14:55:03 -0600
Subject: [PATCH] Disable existing repositories in tripleo-ci

The images that are provided via infra have repositories configured on
them without the local mirrors configured. This change adds a command to
disable all existing repositories on the node before setting up the
defined repos.

Change-Id: Ie055a95f6d5ca8ca704d8b30407b99f3948dad20
Related-Bug: #1709327
---
 .../release/tripleo-ci/consistent-master.yml   | 18 ++++++++++++++++++
 .../release/tripleo-ci/consistent-newton.yml   | 18 ++++++++++++++++++
 config/release/tripleo-ci/consistent-ocata.yml | 18 ++++++++++++++++++
 config/release/tripleo-ci/consistent-pike.yml  | 18 ++++++++++++++++++
 .../master-undercloud-ocata-overcloud.yml      | 18 ++++++++++++++++++
 config/release/tripleo-ci/master.yml           | 18 ++++++++++++++++++
 config/release/tripleo-ci/newton.yml           | 18 ++++++++++++++++++
 config/release/tripleo-ci/ocata.yml            | 18 ++++++++++++++++++
 config/release/tripleo-ci/pike.yml             | 18 ++++++++++++++++++
 9 files changed, 162 insertions(+)

diff --git a/config/release/tripleo-ci/consistent-master.yml b/config/release/tripleo-ci/consistent-master.yml
index 2da1cf8ac..9798979f1 100644
--- a/config/release/tripleo-ci/consistent-master.yml
+++ b/config/release/tripleo-ci/consistent-master.yml
@@ -20,6 +20,7 @@ ipa_image_url: http://66.187.229.139/builds/current-tripleo/ipa_images.tar
 repo_cmd_before: |
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   export CONSISTENT_RDO_MIRROR=`curl --silent https://trunk.rdoproject.org/centos7/consistent/delorean.repo | grep baseurl | cut -d= -f2`
@@ -34,6 +35,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -45,6 +47,22 @@ repos:
     filename: delorean-pike-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-pike/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo
diff --git a/config/release/tripleo-ci/consistent-newton.yml b/config/release/tripleo-ci/consistent-newton.yml
index 6381e937c..28dc1f2f9 100644
--- a/config/release/tripleo-ci/consistent-newton.yml
+++ b/config/release/tripleo-ci/consistent-newton.yml
@@ -20,6 +20,7 @@ ipa_image_url: http://66.187.229.139/builds-newton/current-tripleo-newton/ipa_im
 repo_cmd_before: |
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   export CONSISTENT_RDO_MIRROR=`curl --silent https://trunk.rdoproject.org/centos7-newton/consistent/delorean.repo | grep baseurl | cut -d= -f2`
@@ -34,6 +35,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -45,6 +47,22 @@ repos:
     filename: delorean-newton-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-newton/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo
diff --git a/config/release/tripleo-ci/consistent-ocata.yml b/config/release/tripleo-ci/consistent-ocata.yml
index f19c71362..e5eea3e53 100644
--- a/config/release/tripleo-ci/consistent-ocata.yml
+++ b/config/release/tripleo-ci/consistent-ocata.yml
@@ -20,6 +20,7 @@ ipa_image_url: http://66.187.229.139/builds-ocata/current-tripleo-ocata/ipa_imag
 repo_cmd_before: |
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   export CONSISTENT_RDO_MIRROR=`curl --silent https://trunk.rdoproject.org/centos7-ocata/consistent/delorean.repo | grep baseurl | cut -d= -f2`
@@ -34,6 +35,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -45,6 +47,22 @@ repos:
     filename: delorean-ocata-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-ocata/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo
diff --git a/config/release/tripleo-ci/consistent-pike.yml b/config/release/tripleo-ci/consistent-pike.yml
index 39d5c0646..11e79e2c1 100644
--- a/config/release/tripleo-ci/consistent-pike.yml
+++ b/config/release/tripleo-ci/consistent-pike.yml
@@ -21,6 +21,7 @@ ipa_image_url: http://66.187.229.139/builds-master/current-tripleo-master/ipa_im
 repo_cmd_before: |
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   export CONSISTENT_RDO_MIRROR=`curl --silent https://trunk.rdoproject.org/centos7-pike/consistent/delorean.repo | grep baseurl | cut -d= -f2`
@@ -35,6 +36,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -46,6 +48,22 @@ repos:
     filename: delorean-pike-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-pike/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo
diff --git a/config/release/tripleo-ci/master-undercloud-ocata-overcloud.yml b/config/release/tripleo-ci/master-undercloud-ocata-overcloud.yml
index 8c4452e4f..c52c69f44 100644
--- a/config/release/tripleo-ci/master-undercloud-ocata-overcloud.yml
+++ b/config/release/tripleo-ci/master-undercloud-ocata-overcloud.yml
@@ -28,6 +28,7 @@ repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   export CURRENT_RDO_MIRROR=`curl -L --silent https://trunk.rdoproject.org/centos7/current/delorean.repo | grep baseurl | cut -d= -f2`
   export CURRENT_TRIPLEO_MIRROR=`curl -L --silent https://trunk.rdoproject.org/centos7/current-tripleo/delorean.repo | grep baseurl | cut -d= -f2`
   # If running tripleo-quickstart from review.openstack.org or review.rdoproject.org, try to use AFS mirrors
@@ -42,6 +43,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -76,6 +78,22 @@ repos:
     filename: delorean-pike-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-pike/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo
diff --git a/config/release/tripleo-ci/master.yml b/config/release/tripleo-ci/master.yml
index 1be7ead77..b2ecd5567 100644
--- a/config/release/tripleo-ci/master.yml
+++ b/config/release/tripleo-ci/master.yml
@@ -19,6 +19,7 @@ ipa_image_url: http://66.187.229.139/builds/current-tripleo/ipa_images.tar
 repo_cmd_before: |
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   export CURRENT_RDO_MIRROR=`curl --silent https://trunk.rdoproject.org/centos7/current/delorean.repo | grep baseurl | cut -d= -f2`
@@ -35,6 +36,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -69,6 +71,22 @@ repos:
     filename: delorean-pike-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-pike/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo
diff --git a/config/release/tripleo-ci/newton.yml b/config/release/tripleo-ci/newton.yml
index 99a1d34a9..2545ad85b 100644
--- a/config/release/tripleo-ci/newton.yml
+++ b/config/release/tripleo-ci/newton.yml
@@ -20,6 +20,7 @@ ipa_image_url: http://66.187.229.139/builds-newton/current-tripleo-newton/ipa_im
 repo_cmd_before: |
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   export CONSISTENT_RDO_MIRROR=`curl --silent https://trunk.rdoproject.org/centos7-newton/current/delorean.repo | grep baseurl | cut -d= -f2`
@@ -34,6 +35,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -45,6 +47,22 @@ repos:
     filename: delorean-newton-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-newton/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo
diff --git a/config/release/tripleo-ci/ocata.yml b/config/release/tripleo-ci/ocata.yml
index d6c2831bc..818275d6e 100644
--- a/config/release/tripleo-ci/ocata.yml
+++ b/config/release/tripleo-ci/ocata.yml
@@ -20,6 +20,7 @@ ipa_image_url: http://66.187.229.139/builds-ocata/current-tripleo-ocata/ipa_imag
 repo_cmd_before: |
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   export CONSISTENT_RDO_MIRROR=`curl --silent https://trunk.rdoproject.org/centos7-ocata/current/delorean.repo | grep baseurl | cut -d= -f2`
@@ -34,6 +35,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -45,6 +47,22 @@ repos:
     filename: delorean-ocata-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-ocata/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo
diff --git a/config/release/tripleo-ci/pike.yml b/config/release/tripleo-ci/pike.yml
index d7da6e5fa..7da6fb223 100644
--- a/config/release/tripleo-ci/pike.yml
+++ b/config/release/tripleo-ci/pike.yml
@@ -21,6 +21,7 @@ ipa_image_url: http://66.187.229.139/builds-master/current-tripleo-master/ipa_im
 repo_cmd_before: |
   sudo yum install -y yum-plugin-priorities;
   sudo yum clean all;
+  sudo yum-config-manager --disable "*"
   sudo rm -rf /etc/yum.repos.d/delorean*;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   export CONSISTENT_RDO_MIRROR=`curl --silent https://trunk.rdoproject.org/centos7-pike/current/delorean.repo | grep baseurl | cut -d= -f2`
@@ -35,6 +36,7 @@ repo_cmd_before: |
   export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
   export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
 repos:
+  # RDO repos
   - type: generic
     reponame: delorean
     filename: delorean.repo
@@ -46,6 +48,22 @@ repos:
     filename: delorean-pike-testing.repo
     baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/cloud/x86_64/openstack-pike/
 
+  # CentOS related repos
+  - type: generic
+    reponame: centos-base
+    filename: centos-base.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+
+  - type: generic
+    reponame: centos-updates
+    filename: centos-updates.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+
+  - type: generic
+    reponame: centos-extras
+    filename: centos-extras.repo
+    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+
   - type: generic
     reponame: centos-qemu
     filename: centos-qemu.repo