<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/23949">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: require PROJ environment variable to be set<br><br>Uploading to network:osmocom:* should only be done when these scripts<br>are running in the Osmocom jenkins. Remove the default and require users<br>of the script to explicitly set PROJ.<br><br>Related: SYS#5370<br>Change-Id: If49ce217e77716b63dfde9139e869672a54b66a2<br>---<br>M jobs/osmocom-obs.yml<br>M scripts/common-obs.sh<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>4 files changed, 14 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/23949/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml</span><br><span>index 4d165d6..6562745 100644</span><br><span>--- a/jobs/osmocom-obs.yml</span><br><span>+++ b/jobs/osmocom-obs.yml</span><br><span>@@ -27,6 +27,7 @@</span><br><span>           default: 'refs/remotes/origin/master'</span><br><span>     builders:</span><br><span>       - shell:</span><br><span style="color: hsl(120, 100%, 40%);">+          export PROJ=network:osmocom:{type}</span><br><span>           ./scripts/osmocom-{type}-packages.sh</span><br><span>     scm:</span><br><span>       - git:</span><br><span>diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh</span><br><span>index 38719c8..c5b03f9 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -15,6 +15,10 @@</span><br><span>        sed \</span><br><span>        wget</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if [ -z "$PROJ" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+   echo "PROJ environment variable is not set"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> # Add dependency to all (sub)packages in debian/control and commit the change.</span><br><span> # $1: path to debian/control file</span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index 8eef259..605023c 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -1,14 +1,13 @@</span><br><span> #!/bin/sh</span><br><span> # Generate source packages and upload them to OBS, for the latest feed.</span><br><span style="color: hsl(120, 100%, 40%);">+# Environment variables:</span><br><span style="color: hsl(120, 100%, 40%);">+# * PROJ: the OBS namespace to upload to (e.g. network:osmocom:latest)</span><br><span> . "$(dirname "$0")/common.sh"</span><br><span> . "$(dirname "$0")/common-obs.sh"</span><br><span> </span><br><span> set -e</span><br><span> set -x</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# OBS project name</span><br><span style="color: hsl(0, 100%, 40%);">-PROJ=network:osmocom:latest</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> DT=$(date +%Y%m%d%H%M)</span><br><span> TOP=$(pwd)</span><br><span> DEBSRCDIR="$TOP/debsrc"</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index 706d786..5d37763 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -1,7 +1,8 @@</span><br><span> #!/bin/bash</span><br><span> # Generate source packages and upload them to OBS, for the nightly or next feed.</span><br><span> # Environment variables:</span><br><span style="color: hsl(0, 100%, 40%);">-# * FEED: the binary package feed to upload to, this also controls the source branch that is used:</span><br><span style="color: hsl(120, 100%, 40%);">+# * PROJ: the OBS namespace to upload to (e.g. network:osmocom:nightly)</span><br><span style="color: hsl(120, 100%, 40%);">+# * FEED: controls the source branch that is used:</span><br><span> #   * "nightly": use "master" branch (default)</span><br><span> #   * "next": use "next" branch if it exists, otherwise use "master" branch</span><br><span> . "$(dirname "$0")/common.sh"</span><br><span>@@ -13,23 +14,12 @@</span><br><span> DT=$(date +%Y%m%d%H%M)</span><br><span> OSMO_OBS_CONFLICT_PKGVER="$OSMO_OBS_CONFLICT_PKGVER.$DT"</span><br><span> TOP=$(pwd)/$(mktemp -d nightly-3g_XXXXXX)</span><br><span style="color: hsl(120, 100%, 40%);">+FEED="${FEED:-nightly}"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Set FEED and PROJ, based on the FEED env var</span><br><span style="color: hsl(0, 100%, 40%);">-parse_feed_proj() {</span><br><span style="color: hsl(0, 100%, 40%);">-  FEED="${FEED:-nightly}"</span><br><span style="color: hsl(0, 100%, 40%);">-  case "$FEED" in</span><br><span style="color: hsl(0, 100%, 40%);">-  nightly)</span><br><span style="color: hsl(0, 100%, 40%);">-    PROJ=network:osmocom:nightly</span><br><span style="color: hsl(0, 100%, 40%);">-    ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  next)</span><br><span style="color: hsl(0, 100%, 40%);">-    PROJ=network:osmocom:next</span><br><span style="color: hsl(0, 100%, 40%);">-    ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  *)</span><br><span style="color: hsl(0, 100%, 40%);">-    echo "unsupported feed: $FEED"</span><br><span style="color: hsl(0, 100%, 40%);">-    exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-    ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  esac</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$FEED" != "nightly" ] && [ "$FEED" != "next" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+  echo "unsupported feed: $FEED"</span><br><span style="color: hsl(120, 100%, 40%);">+  exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> ### OBS build</span><br><span> prepare() {</span><br><span>@@ -284,5 +274,4 @@</span><br><span>   post</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-parse_feed_proj</span><br><span> build_osmocom</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/23949">change 23949</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/c/osmo-ci/+/23949"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If49ce217e77716b63dfde9139e869672a54b66a2 </div>
<div style="display:none"> Gerrit-Change-Number: 23949 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>