[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fedora: use mock 1.2.3-2~bpo8+1 to build RPMs

[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 904d13d886c317ff6e6ffb3df73cc76445bedbca
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Jun 10 22:54:49 2016 +0200

    reproducible fedora: use mock 1.2.3-2~bpo8+1 to build RPMs
---
 update_jdn.sh | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/update_jdn.sh b/update_jdn.sh
index 122bdf5..5317b17 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -227,7 +227,6 @@ if [ -f /etc/debian_version ] ; then
 				kgb-client
 				m4
 				make
-				mock
 				python3-yaml
 				subversion
 				sysvinit-core
@@ -314,7 +313,6 @@ if [ -f /etc/debian_version ] ; then
 				libvpx1 
 				libxslt1-dev 
 				linux-image-amd64
-				mock
 				moreutils 
 				mr 
 				mtr-tiny 
@@ -367,6 +365,10 @@ if [ -f /etc/debian_version ] ; then
 		sudo apt-get install -t jessie-backports \
 				pbuilder lintian || echo "this should only fail on the first install"
 		#		botch
+		# we need mock from bpo to build current fedora
+		if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then
+			sudo apt-get install -t jessie-backports mock
+		fi
 		# for varying kernels
 		# we use bpo kernels on pb-build5+6 (and i386 kernel on pb-build2-i386)
 		if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ]; then
@@ -385,19 +387,6 @@ if [ -f /etc/debian_version ] ; then
 fi
 
 #
-# prepare mock to build rpms
-#
-if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then
-	if ! grep mock /etc/group ; then
-		# these 4 commands are obsolete with mock 1.2.3-1 (=stretch)
-		sudo groupadd --system mock
-		sudo usermod -a -G mock jenkins
-		sudo chgrp mock /var/lib/mock/ /var/cache/mock/
-		sudo chmod 2775 /var/lib/mock/ /var/cache/mock/
-	fi
-fi
-
-#
 # deploy package configuration in /etc and /usr/local/
 #
 cd $BASEDIR

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