<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/23664">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">docker_images_require: list installed Osmocom pkgs<br><br>Display an overview of installed Osmocom packages at the start of each<br>ttcn3-*/jenkins.sh script (and others making use of<br>docker_images_require).<br><br>Closes: OS#5091<br>Change-Id: I62670017d790fd67c6a0d8d464386c0f8e94c1a8<br>---<br>M jenkins-common.sh<br>1 file changed, 38 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/64/23664/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jenkins-common.sh b/jenkins-common.sh</span><br><span>index 6c27fae..67a467d 100644</span><br><span>--- a/jenkins-common.sh</span><br><span>+++ b/jenkins-common.sh</span><br><span>@@ -39,6 +39,40 @@</span><br><span> esac</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# $1: distro name, from docker_distro_from_image_name()</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: docker image name (without $REPO_USER/ prefix)</span><br><span style="color: hsl(120, 100%, 40%);">+list_osmo_packages() {</span><br><span style="color: hsl(120, 100%, 40%);">+ local distro="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ local image="$2"</span><br><span style="color: hsl(120, 100%, 40%);">+ local docker_run_sh="docker run --rm --entrypoint=/bin/sh $REPO_USER/$image -c"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Don't run on all images</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$image" in</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-*) ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *) return ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</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%);">+ echo</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "### Installed Osmocom packages in: $image ###"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$distro" in</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*)</span><br><span style="color: hsl(120, 100%, 40%);">+ $docker_run_sh "rpm -qa | grep osmo"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*)</span><br><span style="color: hsl(120, 100%, 40%);">+ $docker_run_sh "dpkg -l | grep osmo"</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%);">+ echo "ERROR: don't know how to list installed packages for distro=$distro"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ echo</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> # Make sure required images are available and build them if necessary.</span><br><span> # $*: image names (e.g. "debian-stretch-build", "osmo-mgw-master", "osmo-mgw-master-centos8")</span><br><span> # The images are automatically built from the Dockerfile of the subdir of</span><br><span>@@ -67,10 +101,11 @@</span><br><span> docker_images_require $depends</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ distro_arg="$(docker_distro_from_image_name "$i")"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Trigger image build (cache will be used when up-to-date)</span><br><span> if [ -z "$NO_DOCKER_IMAGE_BUILD" ]; then</span><br><span> upstream_distro_arg="$(docker_upstream_distro_from_image_name "$i")"</span><br><span style="color: hsl(0, 100%, 40%);">- distro_arg="$(docker_distro_from_image_name "$i")"</span><br><span> dir="$(docker_dir_from_image_name "$i")"</span><br><span> </span><br><span> # Pull upstream base images</span><br><span>@@ -94,6 +129,8 @@</span><br><span> echo "ERROR: missing image: $i"</span><br><span> exit 1</span><br><span> fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ list_osmo_packages "$distro_arg" "$i"</span><br><span> done</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/23664">change 23664</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/docker-playground/+/23664"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I62670017d790fd67c6a0d8d464386c0f8e94c1a8 </div>
<div style="display:none"> Gerrit-Change-Number: 23664 </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>