From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 16 Dec 2016 16:50:29 +0000 (-0600)
Subject: ceph-installer-rpm: remove usage of 'sg'
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F601%2Fhead;p=ceph-build.git

ceph-installer-rpm: remove usage of 'sg'

The sepia nodes, using JNLP, are having troubles building these rpms so
let's just use OVH nodes until we can resolve this.

The issue being that mock runs fine if we use 'sg', but the noarch rpm
is never built.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-installer-rpm/build/build b/ceph-installer-rpm/build/build
index 85376ed6..ae0958ef 100644
--- a/ceph-installer-rpm/build/build
+++ b/ceph-installer-rpm/build/build
@@ -14,9 +14,10 @@ sudo yum -y install fedpkg
 
 # Add the Jenkins slave UID to the mock group.
 sudo usermod -a -G mock $(whoami)
+newgrp mock
 
 # Attempt the build. If it fails, print the mock logs to STDOUT.
-sg mock -c "make rpm" || ( tail -n +1 {root,build}.log && exit 1 )
+make rpm || ( tail -n +1 {root,build}.log && exit 1 )
 
 # Chacra time