<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/16871">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">docker: move to docker-playground.git<br><br>Instead of building "osmocom:deb9_amd64" from this repository, build<br>"$USER/debian-stretch-jenkins" from docker-playground.git (same<br>Dockerfile). Adjust all jobs to use the new image name.<br><br>Add a new "update-osmo-ci-on-slaves-dp" jenkins job, which triggers<br>the existing "update-osmo-ci-on-slaves" job whenever<br>docker-playground.git changes.<br><br>Replace docker/rebuild_osmocom_jenkins_image.sh with<br>scripts/osmo-ci-docker-rebuild.sh, so we can get rid of the docker dir.<br>I thought about dropping the script completely, and directly writing the<br>two lines into contrib/jenkins.sh. But I kept the extra script for<br>convenience, when testing locally.<br><br>Related: OS#4345<br>Depends: docker-playground I125ae8a6bcabbd1f485028c79b0abacda0622c3a<br>Change-Id: I30a61aebcadef5536e74edd35e1c75ef77a2da9f<br>---<br>M contrib/jenkins.sh<br>D docker/Dockerfile_osmocom_jenkins.amd64<br>D docker/rebuild_osmocom_jenkins_image.sh<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>M jobs/osmo-gsm-tester-runner.yml<br>M jobs/update-osmo-ci-on-slaves.yml<br>A scripts/osmo-ci-docker-rebuild.sh<br>8 files changed, 33 insertions(+), 173 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/71/16871/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index b161230..275fc69 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -11,6 +11,5 @@</span><br><span> git status</span><br><span> </span><br><span> if [ `uname` = "Linux" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- cd docker</span><br><span style="color: hsl(0, 100%, 40%);">- ./rebuild_osmocom_jenkins_image.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ scripts/osmo-ci-docker-rebuild.sh</span><br><span> fi</span><br><span>diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>deleted file mode 100644</span><br><span>index 63b6e74..0000000</span><br><span>--- a/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>+++ /dev/null</span><br><span>@@ -1,146 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-ARG DEBIAN_VERSION=stretch</span><br><span style="color: hsl(0, 100%, 40%);">-FROM debian:${DEBIAN_VERSION}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Make "$DEBIAN_VERSION" available after FROM</span><br><span style="color: hsl(0, 100%, 40%);">-# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact</span><br><span style="color: hsl(0, 100%, 40%);">-ARG DEBIAN_VERSION</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Install apt dependencies (keep in alphabetic order)</span><br><span style="color: hsl(0, 100%, 40%);">-RUN \</span><br><span style="color: hsl(0, 100%, 40%);">- dpkg --add-architecture i386 && \</span><br><span style="color: hsl(0, 100%, 40%);">- DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \</span><br><span style="color: hsl(0, 100%, 40%);">- DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \</span><br><span style="color: hsl(0, 100%, 40%);">- asciidoc \</span><br><span style="color: hsl(0, 100%, 40%);">- asciidoc-dblatex \</span><br><span style="color: hsl(0, 100%, 40%);">- autoconf \</span><br><span style="color: hsl(0, 100%, 40%);">- autoconf-archive \</span><br><span style="color: hsl(0, 100%, 40%);">- automake \</span><br><span style="color: hsl(0, 100%, 40%);">- bc \</span><br><span style="color: hsl(0, 100%, 40%);">- bison \</span><br><span style="color: hsl(0, 100%, 40%);">- bzip2 \</span><br><span style="color: hsl(0, 100%, 40%);">- cmake \</span><br><span style="color: hsl(0, 100%, 40%);">- coccinelle \</span><br><span style="color: hsl(0, 100%, 40%);">- cppcheck \</span><br><span style="color: hsl(0, 100%, 40%);">- dahdi-source \</span><br><span style="color: hsl(0, 100%, 40%);">- dblatex \</span><br><span style="color: hsl(0, 100%, 40%);">- dbus \</span><br><span style="color: hsl(0, 100%, 40%);">- debhelper \</span><br><span style="color: hsl(0, 100%, 40%);">- devscripts \</span><br><span style="color: hsl(0, 100%, 40%);">- dh-autoreconf \</span><br><span style="color: hsl(0, 100%, 40%);">- dh-systemd \</span><br><span style="color: hsl(0, 100%, 40%);">- docbook5-xml \</span><br><span style="color: hsl(0, 100%, 40%);">- doxygen \</span><br><span style="color: hsl(0, 100%, 40%);">- flex \</span><br><span style="color: hsl(0, 100%, 40%);">- g++ \</span><br><span style="color: hsl(0, 100%, 40%);">- gawk \</span><br><span style="color: hsl(0, 100%, 40%);">- gcc \</span><br><span style="color: hsl(0, 100%, 40%);">- gcc-arm-none-eabi \</span><br><span style="color: hsl(0, 100%, 40%);">- git \</span><br><span style="color: hsl(0, 100%, 40%);">- git-buildpackage \</span><br><span style="color: hsl(0, 100%, 40%);">- graphviz \</span><br><span style="color: hsl(0, 100%, 40%);">- htop \</span><br><span style="color: hsl(0, 100%, 40%);">- inkscape \</span><br><span style="color: hsl(0, 100%, 40%);">- lcov \</span><br><span style="color: hsl(0, 100%, 40%);">- libaio-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libasound2-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libboost-all-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libc-ares-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libcsv-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libdbd-sqlite3 \</span><br><span style="color: hsl(0, 100%, 40%);">- libdbi-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libffi-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libfftw3-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgmp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgnutls28-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgps-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libgsm1-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- liblua5.3-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libmnl-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libncurses5-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libnewlib-arm-none-eabi \</span><br><span style="color: hsl(0, 100%, 40%);">- liboping-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libortp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libpcap-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libpcsclite-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libreadline-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsctp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsigsegv-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsnmp-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsofia-sip-ua-glib-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libsqlite3-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libssl-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libtalloc-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libtool \</span><br><span style="color: hsl(0, 100%, 40%);">- libusb-1.0-0-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libusb-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- libxml2-utils \</span><br><span style="color: hsl(0, 100%, 40%);">- libzmq3-dev \</span><br><span style="color: hsl(0, 100%, 40%);">- locales \</span><br><span style="color: hsl(0, 100%, 40%);">- lua-socket \</span><br><span style="color: hsl(0, 100%, 40%);">- make \</span><br><span style="color: hsl(0, 100%, 40%);">- mscgen \</span><br><span style="color: hsl(0, 100%, 40%);">- ofono \</span><br><span style="color: hsl(0, 100%, 40%);">- openssh-client \</span><br><span style="color: hsl(0, 100%, 40%);">- osc \</span><br><span style="color: hsl(0, 100%, 40%);">- patchelf \</span><br><span style="color: hsl(0, 100%, 40%);">- pkg-config \</span><br><span style="color: hsl(0, 100%, 40%);">- python3 \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-gi \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-mako \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-nwdiag \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-pip \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-pyflakes \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-setuptools \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-usb \</span><br><span style="color: hsl(0, 100%, 40%);">- python3-yaml \</span><br><span style="color: hsl(0, 100%, 40%);">- rsync \</span><br><span style="color: hsl(0, 100%, 40%);">- sdcc \</span><br><span style="color: hsl(0, 100%, 40%);">- sqlite3 \</span><br><span style="color: hsl(0, 100%, 40%);">- stow \</span><br><span style="color: hsl(0, 100%, 40%);">- sudo \</span><br><span style="color: hsl(0, 100%, 40%);">- systemd \</span><br><span style="color: hsl(0, 100%, 40%);">- tcpdump \</span><br><span style="color: hsl(0, 100%, 40%);">- texinfo \</span><br><span style="color: hsl(0, 100%, 40%);">- unzip \</span><br><span style="color: hsl(0, 100%, 40%);">- wget \</span><br><span style="color: hsl(0, 100%, 40%);">- xsltproc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Install pip dependencies (keep in alphabetic order)</span><br><span style="color: hsl(0, 100%, 40%);">-RUN pip3 install \</span><br><span style="color: hsl(0, 100%, 40%);">- git+https://github.com/podshumok/python-smpplib.git \</span><br><span style="color: hsl(0, 100%, 40%);">- git+https://github.com/eriwen/lcov-to-cobertura-xml.git \</span><br><span style="color: hsl(0, 100%, 40%);">- pydbus \</span><br><span style="color: hsl(0, 100%, 40%);">- pysispm</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# match the outside user</span><br><span style="color: hsl(0, 100%, 40%);">-RUN useradd --uid=1000 build</span><br><span style="color: hsl(0, 100%, 40%);">-#RUN echo "build ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/build</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-RUN mkdir /build</span><br><span style="color: hsl(0, 100%, 40%);">-RUN chown build:build /build</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Install osmo-python-tests</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Set a UTF-8 locale</span><br><span style="color: hsl(0, 100%, 40%);">-RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \</span><br><span style="color: hsl(0, 100%, 40%);">- dpkg-reconfigure --frontend=noninteractive locales && \</span><br><span style="color: hsl(0, 100%, 40%);">- update-locale LANG=en_US.UTF-8</span><br><span style="color: hsl(0, 100%, 40%);">-ENV LANG en_US.UTF-8</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# osmo-remsim needs libulfius (which indirectly depends on systemd, installed above)</span><br><span style="color: hsl(0, 100%, 40%);">-ARG LIBULFIUS_VER="2.6.4"</span><br><span style="color: hsl(0, 100%, 40%);">-ARG LIBULFIUS_PATH="https://github.com/babelouest/ulfius/releases/download/v${LIBULFIUS_VER}"</span><br><span style="color: hsl(0, 100%, 40%);">-ADD ${LIBULFIUS_PATH}/libulfius-dev_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.deb /tmp/ulfius/libulfius-dev.deb</span><br><span style="color: hsl(0, 100%, 40%);">-ADD ${LIBULFIUS_PATH}/ulfius-dev-full_${LIBULFIUS_VER}_debian_${DEBIAN_VERSION}_x86_64.tar.gz /tmp/ulfius/all.tar.gz</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd /tmp/ulfius && \</span><br><span style="color: hsl(0, 100%, 40%);">- tar -xvf all.tar.gz && \</span><br><span style="color: hsl(0, 100%, 40%);">- DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span style="color: hsl(0, 100%, 40%);">- DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/ulfius/*.deb && \</span><br><span style="color: hsl(0, 100%, 40%);">- cd ~ && \</span><br><span style="color: hsl(0, 100%, 40%);">- rm -r /tmp/ulfius</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# osmo-python-tests' contrib/jenkins.sh writes to /usr/local as user</span><br><span style="color: hsl(0, 100%, 40%);">-RUN chown -R build:build /usr/local</span><br><span>diff --git a/docker/rebuild_osmocom_jenkins_image.sh b/docker/rebuild_osmocom_jenkins_image.sh</span><br><span>deleted file mode 100755</span><br><span>index 5d14d83..0000000</span><br><span>--- a/docker/rebuild_osmocom_jenkins_image.sh</span><br><span>+++ /dev/null</span><br><span>@@ -1,22 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/bash -e</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Executes docker build with the given parameters and retry in case of error.</span><br><span style="color: hsl(0, 100%, 40%);">-function build_once() {</span><br><span style="color: hsl(0, 100%, 40%);">- # shellcheck disable=SC2068</span><br><span style="color: hsl(0, 100%, 40%);">- docker build $@ -f Dockerfile_osmocom_jenkins.amd64 .</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%);">-# Builds a container with a debian version and tag name as parameter.</span><br><span style="color: hsl(0, 100%, 40%);">-function build_container() {</span><br><span style="color: hsl(0, 100%, 40%);">- local tag_name=${1}</span><br><span style="color: hsl(0, 100%, 40%);">- local debian_version=${2}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- echo "Pulling ${debian_version} image"</span><br><span style="color: hsl(0, 100%, 40%);">- docker pull "debian:${debian_version}"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- echo "Building for ${debian_version} and setting tag ${tag_name}"</span><br><span style="color: hsl(0, 100%, 40%);">- build_once "-t" "${tag_name}" "--build-arg" DEBIAN_VERSION="${debian_version}"</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%);">-# Create containers using stretch (Debian 9.0) as base.</span><br><span style="color: hsl(0, 100%, 40%);">-build_container osmocom:deb9_amd64 stretch</span><br><span>diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml</span><br><span>index dfc9b88..0c338a6 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -40,7 +40,7 @@</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(0, 100%, 40%);">- docker_img: 'osmocom:deb9_amd64'</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_img: '$USER/debian-stretch-jenkins'</span><br><span> cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418'</span><br><span> repos_url: '{gerrit_url}/{repos}'</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 55626ea..9b751aa 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -41,7 +41,7 @@</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- docker_img: 'osmocom:deb9_amd64'</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_img: 'debian-stretch-jenkins'</span><br><span> cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'</span><br><span> wrappers: []</span><br><span> trigger:</span><br><span>diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml</span><br><span>index c9d84a3..d74c948 100644</span><br><span>--- a/jobs/osmo-gsm-tester-runner.yml</span><br><span>+++ b/jobs/osmo-gsm-tester-runner.yml</span><br><span>@@ -241,7 +241,7 @@</span><br><span> -v "$HOME/bin:/build_bin" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span> --cap-add=sys_nice \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocom:deb9_amd64 /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh'</span><br><span style="color: hsl(120, 100%, 40%);">+ debian-stretch-jenkins /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh'</span><br><span> publishers:</span><br><span> - archive:</span><br><span> artifacts: '*-run.tgz, *-bin.tgz'</span><br><span>diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml</span><br><span>index 2c7309e..d47f08e 100644</span><br><span>--- a/jobs/update-osmo-ci-on-slaves.yml</span><br><span>+++ b/jobs/update-osmo-ci-on-slaves.yml</span><br><span>@@ -39,4 +39,28 @@</span><br><span> - email:</span><br><span> recipients: intern@lists.sysmocom.de</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Trigger from docker-playground.git too</span><br><span style="color: hsl(120, 100%, 40%);">+- job:</span><br><span style="color: hsl(120, 100%, 40%);">+ name: update-osmo-ci-on-slaves-dp</span><br><span style="color: hsl(120, 100%, 40%);">+ description: |</span><br><span style="color: hsl(120, 100%, 40%);">+ Trigger <a href="https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves/">update-osmo-ci-on-slaves</a></span><br><span style="color: hsl(120, 100%, 40%);">+ on changes in docker-playground.git, so it can rebuild docker containers relevant for the jenkins slaves.</span><br><span style="color: hsl(120, 100%, 40%);">+ node: osmocom-master-debian9</span><br><span style="color: hsl(120, 100%, 40%);">+ scm:</span><br><span style="color: hsl(120, 100%, 40%);">+ - git:</span><br><span style="color: hsl(120, 100%, 40%);">+ url: git://git.osmocom.org/docker-playground</span><br><span style="color: hsl(120, 100%, 40%);">+ git-config-name: 'Jenkins Builder'</span><br><span style="color: hsl(120, 100%, 40%);">+ git-config-email: 'jenkins@osmocom.org'</span><br><span style="color: hsl(120, 100%, 40%);">+ skip-tag: true</span><br><span style="color: hsl(120, 100%, 40%);">+ branches:</span><br><span style="color: hsl(120, 100%, 40%);">+ - 'origin/master'</span><br><span style="color: hsl(120, 100%, 40%);">+ triggers:</span><br><span style="color: hsl(120, 100%, 40%);">+ - pollscm:</span><br><span style="color: hsl(120, 100%, 40%);">+ cron: "H/5 * * * *"</span><br><span style="color: hsl(120, 100%, 40%);">+ ignore-post-commit-hooks: false</span><br><span style="color: hsl(120, 100%, 40%);">+ publishers:</span><br><span style="color: hsl(120, 100%, 40%);">+ - trigger:</span><br><span style="color: hsl(120, 100%, 40%);">+ project: "update-osmo-ci-on-slaves"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # vim: expandtab tabstop=2 shiftwidth=2</span><br><span>diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..4a7ee25</span><br><span>--- /dev/null</span><br><span>+++ b/scripts/osmo-ci-docker-rebuild.sh</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+cd "$(dirname "$0")/.."</span><br><span style="color: hsl(120, 100%, 40%);">+. scripts/common.sh</span><br><span style="color: hsl(120, 100%, 40%);">+docker_images_require \</span><br><span style="color: hsl(120, 100%, 40%);">+ "debian-stretch-jenkins"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/16871">change 16871</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/+/16871"/><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: I30a61aebcadef5536e74edd35e1c75ef77a2da9f </div>
<div style="display:none"> Gerrit-Change-Number: 16871 </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>