<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/26491">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OSMO_RELEASE_REPOS: add simtrace2, osmo-remsim<br><br>Adjust to simtrace2's directory structure, which does not have a<br>configure.ac in the main directory like all other repositories. The main<br>directory has a regular Makefile without autotools, only the host dir<br>has a configure.ac file (and only in newer versions). Deal with this by<br>creating two tarballs, one with "git archive" for the whole directory,<br>and one for the host dir only with the usual "autoreconf -fi;<br>./configure; make dist-bzip2". The latter one has the files created by<br>autoreconf ("configure" script and others).<br><br>simtrace2<br>├── simtrace2-0.1.tar.bz2<br>├── simtrace2-0.2.tar.bz2<br>├── simtrace2-0.3.tar.bz2<br>├── simtrace2-0.4.tar.bz2<br>├── simtrace2-0.5.1.tar.bz2<br>├── simtrace2-0.5.tar.bz2<br>├── simtrace2-0.6.1.tar.bz2<br>├── simtrace2-0.6.tar.bz2<br>├── simtrace2-0.7.0.tar.bz2<br>├── simtrace2-0.7.1.tar.bz2<br>├── simtrace2-0.8.0.tar.bz2<br>├── simtrace2-0.8.1.tar.bz2<br>├── simtrace2-host-0.6.1.tar.bz2<br>├── simtrace2-host-0.6.tar.bz2<br>├── simtrace2-host-0.7.0.tar.bz2<br>├── simtrace2-host-0.7.1.tar.bz2<br>├── simtrace2-host-0.8.0.tar.bz2<br>└── simtrace2-host-0.8.1.tar.bz2<br><br>Closes: OS#5347<br>Change-Id: Ib52a23a2a7d6ea64bfa539b1d026f035fdb3af57<br>---<br>M scripts/common.sh<br>M scripts/osmocom-release-tarballs.sh<br>2 files changed, 74 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common.sh b/scripts/common.sh</span><br><span>index 10fe7f3..8657fd8 100644</span><br><span>--- a/scripts/common.sh</span><br><span>+++ b/scripts/common.sh</span><br><span>@@ -29,6 +29,7 @@</span><br><span> osmo-msc</span><br><span> osmo-pcap</span><br><span> osmo-pcu</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-remsim</span><br><span> osmo-sgsn</span><br><span> osmo-sip-connector</span><br><span> osmo-smlc</span><br><span>@@ -36,6 +37,7 @@</span><br><span> osmo-trx</span><br><span> osmo-uecups</span><br><span> osmocom-bb</span><br><span style="color: hsl(120, 100%, 40%);">+ simtrace2</span><br><span> "</span><br><span> </span><br><span> OSMO_BRANCH_DOCKER_PLAYGROUND="${OSMO_BRANCH_DOCKER_PLAYGROUND:-master}"</span><br><span>diff --git a/scripts/osmocom-release-tarballs.sh b/scripts/osmocom-release-tarballs.sh</span><br><span>index 18ea1d7..8242a49 100755</span><br><span>--- a/scripts/osmocom-release-tarballs.sh</span><br><span>+++ b/scripts/osmocom-release-tarballs.sh</span><br><span>@@ -128,7 +128,7 @@</span><br><span> }</span><br><span> </span><br><span> # Clone an Osmocom repository to $TEMP/repos/$repo, clean it, checkout a tag.</span><br><span style="color: hsl(0, 100%, 40%);">-# $1: Osmocom repository</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host)</span><br><span> # $2: tag (optional, default: master)</span><br><span> prepare_repo() {</span><br><span> local repo="$1"</span><br><span>@@ -144,13 +144,21 @@</span><br><span> git checkout -q "$tag"</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Get the desired tarball name, replace / with - in $1.</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host)</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: tag</span><br><span style="color: hsl(120, 100%, 40%);">+tarball_name() {</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$(echo "$repo" | tr / -)-$tag.tar.bz2"</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Checkout a given tag and build a release tarball.</span><br><span style="color: hsl(0, 100%, 40%);">-# $1: Osmocom repository</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host)</span><br><span> # $2: tag</span><br><span> create_tarball() {</span><br><span> local repo="$1"</span><br><span> local tag="$2"</span><br><span style="color: hsl(0, 100%, 40%);">- local tarball="$repo-$tag.tar.bz2"</span><br><span style="color: hsl(120, 100%, 40%);">+ local tarball="$(tarball_name "$repo" "$tag")"</span><br><span> </span><br><span> # Be verbose during the tarball build and preparation. Everything else is not verbose, so we can generate an</span><br><span> # easy to read overview of tarballs that are already built or are ignored.</span><br><span>@@ -174,15 +182,72 @@</span><br><span> fi</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Create a release tarball with "git archive" for non-autotools projects.</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: Osmocom repository</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: tag</span><br><span style="color: hsl(120, 100%, 40%);">+create_tarball_git() {</span><br><span style="color: hsl(120, 100%, 40%);">+ local repo="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ local tag="$2"</span><br><span style="color: hsl(120, 100%, 40%);">+ local tarball="$(tarball_name "$repo" "$tag")"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ set -x</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cd "$TEMP/repos/$repo"</span><br><span style="color: hsl(120, 100%, 40%);">+ git archive \</span><br><span style="color: hsl(120, 100%, 40%);">+ -o "$tarball" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "$tag"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ set +x</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Move a generated release tarball to the output dir.</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host)</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: tag</span><br><span> move_tarball() {</span><br><span> local repo="$1"</span><br><span> local tag="$2"</span><br><span style="color: hsl(0, 100%, 40%);">- local tarball="$repo-$tag.tar.bz2"</span><br><span style="color: hsl(120, 100%, 40%);">+ local tarball="$(tarball_name "$repo" "$tag")"</span><br><span style="color: hsl(120, 100%, 40%);">+ local repo_dir="$(echo "$repo" | cut -d / -f 1)"</span><br><span> </span><br><span> cd "$TEMP/repos/$repo"</span><br><span style="color: hsl(0, 100%, 40%);">- mkdir -p "$OUTPUT/$repo"</span><br><span style="color: hsl(0, 100%, 40%);">- mv "$tarball" "$OUTPUT/$repo/$tarball"</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir -p "$OUTPUT/$repo_dir"</span><br><span style="color: hsl(120, 100%, 40%);">+ mv "$tarball" "$OUTPUT/$repo_dir/$tarball"</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Check if a git tag has a specific file</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: Osmocom repository</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: tag</span><br><span style="color: hsl(120, 100%, 40%);">+# $3: file</span><br><span style="color: hsl(120, 100%, 40%);">+tag_has_file() {</span><br><span style="color: hsl(120, 100%, 40%);">+ local repo="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ local tag="$2"</span><br><span style="color: hsl(120, 100%, 40%);">+ local file="$3"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ git -C "$TEMP/repos/$repo" show "$tag:$file" >/dev/null 2>&1</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Create and move tarballs for Osmocom repositories.</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: Osmocom repository</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: tag</span><br><span style="color: hsl(120, 100%, 40%);">+create_move_tarball() {</span><br><span style="color: hsl(120, 100%, 40%);">+ local repo="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ local tag="$2"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$repo" in</span><br><span style="color: hsl(120, 100%, 40%);">+ simtrace2)</span><br><span style="color: hsl(120, 100%, 40%);">+ if tag_has_file "$repo" "$tag" host/configure.ac; then</span><br><span style="color: hsl(120, 100%, 40%);">+ create_tarball "$repo/host" "$tag"</span><br><span style="color: hsl(120, 100%, 40%);">+ move_tarball "$repo/host" "$tag"</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%);">+ create_tarball_git "$repo" "$tag"</span><br><span style="color: hsl(120, 100%, 40%);">+ move_tarball "$repo" "$tag"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *)</span><br><span style="color: hsl(120, 100%, 40%);">+ create_tarball "$repo" "$tag"</span><br><span style="color: hsl(120, 100%, 40%);">+ move_tarball "$repo" "$tag"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> }</span><br><span> </span><br><span> remove_temp_dir</span><br><span>@@ -211,8 +276,7 @@</span><br><span> fi</span><br><span> </span><br><span> echo " $tarball (creating)"</span><br><span style="color: hsl(0, 100%, 40%);">- create_tarball "$repo" "$tag"</span><br><span style="color: hsl(0, 100%, 40%);">- move_tarball "$repo" "$tag"</span><br><span style="color: hsl(120, 100%, 40%);">+ create_move_tarball "$repo" "$tag"</span><br><span> done</span><br><span> done</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/26491">change 26491</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/+/26491"/><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: Ib52a23a2a7d6ea64bfa539b1d026f035fdb3af57 </div>
<div style="display:none"> Gerrit-Change-Number: 26491 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>