From 83ea1276600729d361bf641cfdfd841fb34853c3 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 23 Mar 2017 16:17:30 -0600
Subject: [PATCH] reconfigure apt during every "pbuilder update"

The nfs-ganesha pbuilder setup code configures the pbuilder caches to
point at repos from shaman. Since all Jenkins jobs uses the same
pbuilder cache tarballs, this means that these shaman repositories will
still be enabled in the next jobs that run on a slave.

1) nfs-ganesha job runs on a slave
2) nfs-ganesha job configures pbuilder cache to use shaman repo
3) nfs-ganesha job finishes
4) ceph-build job runs on same slave slave
5) ceph-build job uses same pbuilder cache with shaman repo configured

In addition to polluting the pbuilder environment, this can also lead to
pbuilder failures when shaman/chacra garbage-collects old repositories,
because Apt wants to download repo metadata from old ceph repos that
are no longer available.

Force every job that runs "pbuilder update" to also run with
"--override-config" in order to wipe out any apt repositories that may
have been configured in the cache.
---
 ceph-build/build/setup_pbuilder         | 3 ++-
 ceph-dev-build/build/setup_pbuilder     | 3 ++-
 ceph-dev-new-build/build/setup_pbuilder | 3 ++-
 diamond-build/build/setup_pbuilder      | 3 ++-
 scripts/build_utils.sh                  | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ceph-build/build/setup_pbuilder b/ceph-build/build/setup_pbuilder
index f45a9a1f..12f9797a 100755
--- a/ceph-build/build/setup_pbuilder
+++ b/ceph-build/build/setup_pbuilder
@@ -91,7 +91,8 @@ if [ -e $basedir/$DIST.tgz ]; then
     sudo pbuilder update \
     --basetgz $basedir/$DIST.tgz \
     --distribution $DIST \
-    --mirror "$mirror"
+    --mirror "$mirror" \
+    --override-config
 else
     echo building $DIST base.tgz
     sudo pbuilder create \
diff --git a/ceph-dev-build/build/setup_pbuilder b/ceph-dev-build/build/setup_pbuilder
index f45a9a1f..12f9797a 100755
--- a/ceph-dev-build/build/setup_pbuilder
+++ b/ceph-dev-build/build/setup_pbuilder
@@ -91,7 +91,8 @@ if [ -e $basedir/$DIST.tgz ]; then
     sudo pbuilder update \
     --basetgz $basedir/$DIST.tgz \
     --distribution $DIST \
-    --mirror "$mirror"
+    --mirror "$mirror" \
+    --override-config
 else
     echo building $DIST base.tgz
     sudo pbuilder create \
diff --git a/ceph-dev-new-build/build/setup_pbuilder b/ceph-dev-new-build/build/setup_pbuilder
index f45a9a1f..12f9797a 100755
--- a/ceph-dev-new-build/build/setup_pbuilder
+++ b/ceph-dev-new-build/build/setup_pbuilder
@@ -91,7 +91,8 @@ if [ -e $basedir/$DIST.tgz ]; then
     sudo pbuilder update \
     --basetgz $basedir/$DIST.tgz \
     --distribution $DIST \
-    --mirror "$mirror"
+    --mirror "$mirror" \
+    --override-config
 else
     echo building $DIST base.tgz
     sudo pbuilder create \
diff --git a/diamond-build/build/setup_pbuilder b/diamond-build/build/setup_pbuilder
index 0e352c74..15f2f165 100755
--- a/diamond-build/build/setup_pbuilder
+++ b/diamond-build/build/setup_pbuilder
@@ -81,7 +81,8 @@ if [ -e $basedir/$DIST.tgz ]; then
     sudo pbuilder update \
     --basetgz $basedir/$DIST.tgz \
     --distribution $DIST \
-    --mirror "$mirror"
+    --mirror "$mirror" \
+    --override-config
 else
     echo building $DIST base.tgz
     sudo pbuilder create \
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 0874891d..db5e7e86 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -396,7 +396,8 @@ setup_pbuilder() {
         sudo pbuilder update \
         --basetgz $basedir/$DIST.tgz \
         --distribution $DIST \
-        --mirror "$mirror"
+        --mirror "$mirror" \
+        --override-config
     else
         echo building $DIST base.tgz
         sudo pbuilder create \
-- 
2.39.5