<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/23952">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: add PACKAGES env var<br><br>Skip checking out and building source packages of all other packages, if<br>the environment variable is set.<br><br>Related: SYS#5370<br>Change-Id: I83c3744713fd6abda4b832460f30eb2e79ebeed8<br>---<br>M scripts/common-obs.sh<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>3 files changed, 52 insertions(+), 0 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/52/23952/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh</span><br><span>index c5b03f9..156dfba 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -171,6 +171,27 @@</span><br><span>     fi</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Check if checkout or build of a given package should be skipped, based on the</span><br><span style="color: hsl(120, 100%, 40%);">+# PACKAGES environment variable.</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: package name (e.g. "libosmocore")</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_obs_skip_pkg() {</span><br><span style="color: hsl(120, 100%, 40%);">+      local pkgname="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if [ -z "$PACKAGES" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+         # Don't skip</span><br><span style="color: hsl(120, 100%, 40%);">+              return 1</span><br><span style="color: hsl(120, 100%, 40%);">+      fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  for i in "osmocom-$FEED" $PACKAGES; do</span><br><span style="color: hsl(120, 100%, 40%);">+              if [ "$i" = "$pkgname" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                    return 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%);">+        # Skip</span><br><span style="color: hsl(120, 100%, 40%);">+        return 0</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Copy an already checked out repository dir and apply a distribution specific patch.</span><br><span> # $PWD must be where all repositories are checked out in subdirs.</span><br><span> # $1: distribution name (e.g. "debian8")</span><br><span>@@ -180,6 +201,10 @@</span><br><span>     local repo="$2"</span><br><span>    local patch</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+       if osmo_obs_skip_pkg "$repo"; then</span><br><span style="color: hsl(120, 100%, 40%);">+          return</span><br><span style="color: hsl(120, 100%, 40%);">+        fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         echo</span><br><span>         echo "====> Checking out $repo-$distro"</span><br><span> </span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index 767d866..c530f27 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> #   * "latest": use latest tagged release (default)</span><br><span> #   * other (e.g. "2021q1"): use last commit of branch of same name, exit with</span><br><span> #     error if it does not exist</span><br><span style="color: hsl(120, 100%, 40%);">+# * PACKAGES: set to a space-separated list of packages to skip all others</span><br><span> . "$(dirname "$0")/common.sh"</span><br><span> . "$(dirname "$0")/common-obs.sh"</span><br><span> </span><br><span>@@ -75,6 +76,10 @@</span><br><span>   url=$2</span><br><span>   gitbpargs=""</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  if osmo_obs_skip_pkg "$project"; then</span><br><span style="color: hsl(120, 100%, 40%);">+    return</span><br><span style="color: hsl(120, 100%, 40%);">+  fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   if [ -z "$url" ]; then</span><br><span>     url="$(osmo_git_clone_url "$project")"</span><br><span>   fi</span><br><span>@@ -102,6 +107,11 @@</span><br><span>   project=$1</span><br><span>   gitbpargs="$2"</span><br><span>   output="$DEBSRCDIR/$project"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  if osmo_obs_skip_pkg "$project"; then</span><br><span style="color: hsl(120, 100%, 40%);">+    return</span><br><span style="color: hsl(120, 100%, 40%);">+  fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   echo</span><br><span>   echo "====> Building $project"</span><br><span>   cd "$TOP/$project"</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index 95e7400..ea69b94 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -7,6 +7,7 @@</span><br><span> # * 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 style="color: hsl(120, 100%, 40%);">+# * PACKAGES: set to a space-separated list of packages to skip all others</span><br><span> . "$(dirname "$0")/common.sh"</span><br><span> . "$(dirname "$0")/common-obs.sh"</span><br><span> </span><br><span>@@ -85,6 +86,10 @@</span><br><span>   local url=$2</span><br><span>   local branch=$3</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  if osmo_obs_skip_pkg "$name"; then</span><br><span style="color: hsl(120, 100%, 40%);">+    return</span><br><span style="color: hsl(120, 100%, 40%);">+  fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   if [ -z "$url" ]; then</span><br><span>     url="$(osmo_git_clone_url "$name")"</span><br><span>   fi</span><br><span>@@ -112,6 +117,10 @@</span><br><span>   local oscdir=$REPO/osc/$PROJ/$name</span><br><span>   local dependver="$OSMO_OBS_CONFLICT_PKGVER"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  if osmo_obs_skip_pkg "$name"; then</span><br><span style="color: hsl(120, 100%, 40%);">+    return</span><br><span style="color: hsl(120, 100%, 40%);">+  fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   if [ -z "$changelog" ] ; then</span><br><span>     changelog=commit</span><br><span>   fi</span><br><span>@@ -165,6 +174,10 @@</span><br><span> }</span><br><span> </span><br><span> checkout_limesuite() {</span><br><span style="color: hsl(120, 100%, 40%);">+  if osmo_obs_skip_pkg "limesuite"; then</span><br><span style="color: hsl(120, 100%, 40%);">+    return</span><br><span style="color: hsl(120, 100%, 40%);">+  fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   cd "$REPO"</span><br><span>   git clone https://github.com/myriadrf/LimeSuite limesuite</span><br><span>   TAG="$(get_last_tag limesuite)"</span><br><span>@@ -173,6 +186,10 @@</span><br><span> }</span><br><span> </span><br><span> checkout_open5gs() {</span><br><span style="color: hsl(120, 100%, 40%);">+  if osmo_obs_skip_pkg "open5gs"; then</span><br><span style="color: hsl(120, 100%, 40%);">+    return</span><br><span style="color: hsl(120, 100%, 40%);">+  fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   cd "$REPO"</span><br><span>   git clone https://github.com/open5gs/open5gs</span><br><span>   cd open5gs</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/23952">change 23952</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/+/23952"/><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: I83c3744713fd6abda4b832460f30eb2e79ebeed8 </div>
<div style="display:none"> Gerrit-Change-Number: 23952 </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>