<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9223">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib: common: create_bin_tgz supports sbin dir now<br><br>Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8<br>---<br>M contrib/jenkins-build-common.sh<br>M contrib/jenkins-build-osmo-bsc.sh<br>M contrib/jenkins-build-osmo-bts.sh<br>M contrib/jenkins-build-osmo-mgw.sh<br>4 files changed, 31 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/23/9223/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh</span><br><span>index 9d85622..79509bc 100644</span><br><span>--- a/contrib/jenkins-build-common.sh</span><br><span>+++ b/contrib/jenkins-build-common.sh</span><br><span>@@ -139,32 +139,42 @@</span><br><span>   make install</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+prune_files() {</span><br><span style="color: hsl(120, 100%, 40%);">+        bindir="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+        wanted_binaries="$2"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if [ ! -d "$prefix_real"/$bindir ]; then return; fi</span><br><span style="color: hsl(120, 100%, 40%);">+        # remove binaries not intended to originate from this build</span><br><span style="color: hsl(120, 100%, 40%);">+        cd "$prefix_real"/$bindir</span><br><span style="color: hsl(120, 100%, 40%);">+        for f in * ; do</span><br><span style="color: hsl(120, 100%, 40%);">+          if [ -z "$(echo "_ $wanted_binaries _" | grep " $f ")" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+            rm "$f"</span><br><span style="color: hsl(120, 100%, 40%);">+          fi</span><br><span style="color: hsl(120, 100%, 40%);">+        done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        # ensure requested binaries indeed exist</span><br><span style="color: hsl(120, 100%, 40%);">+        for b in $wanted_binaries ; do</span><br><span style="color: hsl(120, 100%, 40%);">+          if [ ! -f "$b" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+            set +x; echo "ERROR: no such binary: $b in $prefix_real/$bindir/"; set -x</span><br><span style="color: hsl(120, 100%, 40%);">+            ls -1 "$prefix_real/$bindir"</span><br><span style="color: hsl(120, 100%, 40%);">+            exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+          fi</span><br><span style="color: hsl(120, 100%, 40%);">+        done</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> create_bin_tgz() {</span><br><span>   # build the archive that is going to be copied to the tester</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  wanted_binaries="$@"</span><br><span style="color: hsl(120, 100%, 40%);">+  wanted_binaries_bin="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+  wanted_binaries_sbin="$2"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  if [ -z "$wanted_binaries" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+  if [ -z "$wanted_binaries_bin" ] && [ -z "$wanted_binaries_sbin" ]; then</span><br><span>     set +x; echo "ERROR: create_bin_tgz needs a list of permitted binaries"; set -x</span><br><span>     exit 1</span><br><span>   fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  # remove binaries not intended to originate from this build</span><br><span style="color: hsl(0, 100%, 40%);">-  cd "$prefix_real"/bin</span><br><span style="color: hsl(0, 100%, 40%);">-  for f in * ; do</span><br><span style="color: hsl(0, 100%, 40%);">-    if [ -z "$(echo "_ $wanted_binaries _" | grep " $f ")" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-      rm "$f"</span><br><span style="color: hsl(0, 100%, 40%);">-    fi</span><br><span style="color: hsl(0, 100%, 40%);">-  done</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  # ensure requested binaries indeed exist</span><br><span style="color: hsl(0, 100%, 40%);">-  for b in $wanted_binaries ; do</span><br><span style="color: hsl(0, 100%, 40%);">-    if [ ! -f "$b" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-      set +x; echo "ERROR: no such binary: $b in $prefix_real/bin/"; set -x</span><br><span style="color: hsl(0, 100%, 40%);">-      ls -1 "$prefix_real/bin"</span><br><span style="color: hsl(0, 100%, 40%);">-      exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-    fi</span><br><span style="color: hsl(0, 100%, 40%);">-  done</span><br><span style="color: hsl(120, 100%, 40%);">+  prune_files bin "$wanted_binaries_bin"</span><br><span style="color: hsl(120, 100%, 40%);">+  prune_files sbin "$wanted_binaries_sbin"</span><br><span> </span><br><span>   cd "$prefix_real"</span><br><span>   this="$name.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"</span><br><span>diff --git a/contrib/jenkins-build-osmo-bsc.sh b/contrib/jenkins-build-osmo-bsc.sh</span><br><span>index 73e71e5..4081a00 100755</span><br><span>--- a/contrib/jenkins-build-osmo-bsc.sh</span><br><span>+++ b/contrib/jenkins-build-osmo-bsc.sh</span><br><span>@@ -11,4 +11,4 @@</span><br><span> build_repo osmo-mgw --enable-sanitize</span><br><span> build_repo osmo-bsc --enable-sanitize</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-create_bin_tgz osmo-bsc abisip-find ipaccess-config</span><br><span style="color: hsl(120, 100%, 40%);">+create_bin_tgz "osmo-bsc abisip-find ipaccess-config"</span><br><span>diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh</span><br><span>index b40c613..e5fab5d 100755</span><br><span>--- a/contrib/jenkins-build-osmo-bts.sh</span><br><span>+++ b/contrib/jenkins-build-osmo-bts.sh</span><br><span>@@ -10,4 +10,4 @@</span><br><span> build_repo libosmo-abis --enable-sanitize</span><br><span> build_repo osmo-bts --enable-sanitize --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-create_bin_tgz osmo-bts-trx osmo-bts-octphy</span><br><span style="color: hsl(120, 100%, 40%);">+create_bin_tgz "osmo-bts-trx osmo-bts-octphy"</span><br><span>diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh</span><br><span>index d4ff0b9..43473c6 100755</span><br><span>--- a/contrib/jenkins-build-osmo-mgw.sh</span><br><span>+++ b/contrib/jenkins-build-osmo-mgw.sh</span><br><span>@@ -9,4 +9,4 @@</span><br><span> build_repo libosmo-netif --enable-sanitize --disable-doxygen</span><br><span> build_repo osmo-mgw --enable-sanitize</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-create_bin_tgz osmo-bsc_mgcp osmo-mgw</span><br><span style="color: hsl(120, 100%, 40%);">+create_bin_tgz "osmo-bsc_mgcp osmo-mgw"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9223">change 9223</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9223"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 </div>
<div style="display:none"> Gerrit-Change-Number: 9223 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>