[Qa-jenkins-scm] [jenkins.debian.net] 03/05: Revert "reproducible rpms: don't try to use yum inside mock, it doesnt work, for whatever reason"

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 34ae8754eabc844e41cfd178c3d728b0cc3c4465
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Dec 15 16:09:46 2015 +0100

    Revert "reproducible rpms: don't try to use yum inside mock, it doesnt work, for whatever reason"
    
    This reverts commit 7bb713f14db4e12587241c852fc8910b3affa0cf.
---
 bin/reproducible_build_rpm.sh  | 5 ++---
 bin/reproducible_setup_mock.sh | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/bin/reproducible_build_rpm.sh b/bin/reproducible_build_rpm.sh
index dd76a39..6b12d29 100755
--- a/bin/reproducible_build_rpm.sh
+++ b/bin/reproducible_build_rpm.sh
@@ -42,9 +42,8 @@ update_mock() {
 		echo "$(date -u ) - updating mock for $RELEASE ($ARCH) on $HOSTNAME now..."
 		mock -r $RELEASE-$ARCH --resultdir=. --cleanup-after -v --update 2>&1
 		echo "$(date -u ) - mock updated."
-		# set the end of reproducible_setup_mock to learn why this is commented out 
-		#yum -v check-update
-		#echo "$(date -u ) - yum updated."
+		yum -v check-update
+		echo "$(date -u ) - yum updated."
 		touch $STAMP
 	else
 		echo "$(date -u ) - mock and yum not updated, last update was at $(TZ=UTC ls --full-time $STAMP | cut -d ' ' -f6-7 | cut -d '.' -f1) UTC."
diff --git a/bin/reproducible_setup_mock.sh b/bin/reproducible_setup_mock.sh
index 42efc66..6c554b1 100755
--- a/bin/reproducible_setup_mock.sh
+++ b/bin/reproducible_setup_mock.sh
@@ -41,8 +41,6 @@ echo "$(date -u) - mock --install rpm-build"
 mock -r $RELEASE-$ARCH --resultdir=. -v --install rpm-build yum
 echo "$(date -u) - mock --update"
 mock -r $RELEASE-$ARCH --resultdir=. -v --update
-# AIUI, this should work but fails with "UnboundLocalError: local variable 'chrootstate' referenced before assignment"
-# as can be seen in https://jenkins.debian.net/view/reproducible/job/reproducible_setup_mock_fedora-23_x86_64_profitbricks3/13/console
-#echo "$(date -u) - yum makecache"
-#mock -r $RELEASE-$ARCH --resultdir=. -v --chroot yum makecache
+echo "$(date -u) - yum makecache"
+mock -r $RELEASE-$ARCH --resultdir=. -v --chroot yum makecache
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git