<p>Daniel Willmann has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13779">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add OSMO_*_BRANCH environment variables for build args<br><br>Previously we could only set OSMO_TTCN3_BRANCH as environment variable<br>to build a test other than master.<br><br>This patch adds environment variables for all osmo-*-master images which<br>allow docker tests to be executed for an arbitrary commit.<br><br>The origin/ prefix from the git checkout command is removed so the<br>*_BRANCH variable doesn't have to contain branch names, but van also<br>contain arbitrary commits. This shouldn't have any adverse effect as we<br>only have one remote in the checkout.<br><br>Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869<br>---<br>M make/Makefile<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-ggsn-master/Dockerfile<br>M osmo-hlr-master/Dockerfile<br>M osmo-hnbgw-master/Dockerfile<br>M osmo-mgw-master/Dockerfile<br>M osmo-msc-master/Dockerfile<br>M osmo-nitb-master/Dockerfile<br>M osmo-pcu-master/Dockerfile<br>M osmo-sgsn-master/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M osmo-stp-master/Dockerfile<br>13 files changed, 40 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/79/13779/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/make/Makefile b/make/Makefile</span><br><span>index 7dfa795..000db25 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -17,6 +17,18 @@</span><br><span> USERNAME?=$(USER)</span><br><span> NAME?=$(shell basename $(CURDIR))</span><br><span> OSMO_TTCN3_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_BSC_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_BTS_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GGSN_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_HLR_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_IUH_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_MGW_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_MSC_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_NITB_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_PCU_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_SGSN_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_SIP_BRANCH?=master</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_STP_BRANCH?=master</span><br><span> PULL?=</span><br><span> </span><br><span> RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support</span><br><span>@@ -42,6 +54,18 @@</span><br><span> </span><br><span> docker-build: .release</span><br><span> docker build --build-arg USER=$(USERNAME) --build-arg OSMO_TTCN3_BRANCH=$(OSMO_TTCN3_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_HLR_BRANCH=$(OSMO_HLR_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_IUH_BRANCH=$(OSMO_IUH_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_MGW_BRANCH=$(OSMO_MGW_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_MSC_BRANCH=$(OSMO_MSC_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_NITB_BRANCH=$(OSMO_NITB_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_PCU_BRANCH=$(OSMO_PCU_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_SGSN_BRANCH=$(OSMO_SGSN_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \</span><br><span> $(PULL) -t $(IMAGE):latest .</span><br><span> @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \</span><br><span> DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \</span><br><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 61ac8e4..bcd0573 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -32,7 +32,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc</span><br><span> </span><br><span> RUN cd osmo-bsc && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_BSC_BRANCH origin/$OSMO_BSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_BSC_BRANCH $OSMO_BSC_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index be58081..f4ddf3a 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -33,7 +33,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts</span><br><span> </span><br><span> RUN cd osmo-bts && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_BTS_BRANCH origin/$OSMO_BTS_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_BTS_BRANCH $OSMO_BTS_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-trx && \</span><br><span>diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index ca4f111..cf84d02 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -25,7 +25,7 @@</span><br><span> RUN git clone git://git.osmocom.org/osmo-ggsn.git</span><br><span> ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit</span><br><span> RUN cd osmo-ggsn && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_GGSN_BRANCH origin/$OSMO_GGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_GGSN_BRANCH $OSMO_GGSN_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile</span><br><span>index 75f29d9..2da7c08 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -30,7 +30,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-hlr/patch?h=$OSMO_HLR_BRANCH /tmp/commit-osmo-hlr</span><br><span> </span><br><span> RUN cd osmo-hlr && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_HLR_BRANCH origin/$OSMO_HLR_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_HLR_BRANCH $OSMO_HLR_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile</span><br><span>index 4334e4f..c89502b 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -30,7 +30,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-mgw</span><br><span> </span><br><span> RUN cd osmo-iuh && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_IUH_BRANCH origin/$OSMO_IUH_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_IUH_BRANCH $OSMO_IUH_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile</span><br><span>index c333b1d..4c6d32a 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -30,7 +30,7 @@</span><br><span> </span><br><span> </span><br><span> RUN cd osmo-mgw && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_MGW_BRANCH origin/$OSMO_MGW_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_MGW_BRANCH $OSMO_MGW_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile</span><br><span>index 49be9c8..c8cfd62 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -37,7 +37,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-msc/patch?h=$OSMO_MSC_BRANCH /tmp/commit-osmo-msc</span><br><span> </span><br><span> RUN cd osmo-msc && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_MSC_BRANCH origin/$OSMO_MSC_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_MSC_BRANCH $OSMO_MSC_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-smpp --enable-iu && \</span><br><span>diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile</span><br><span>index bed228e..d3774da 100644</span><br><span>--- a/osmo-nitb-master/Dockerfile</span><br><span>+++ b/osmo-nitb-master/Dockerfile</span><br><span>@@ -25,11 +25,14 @@</span><br><span> </span><br><span> WORKDIR /tmp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_NITB_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RUN git clone git://git.osmocom.org/openbsc.git</span><br><span style="color: hsl(0, 100%, 40%);">-ADD http://git.osmocom.org/openbsc/patch /tmp/commit-openbsc</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://git.osmocom.org/openbsc/patch?h=$OSMO_NITB_BRANCH /tmp/commit-openbsc</span><br><span> </span><br><span> RUN cd openbsc/openbsc && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B master origin/master && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_NITB_BRANCH $OSMO_NITB_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-nat --enable-osmo-bsc --enable-smpp && \</span><br><span> make -j8 install && \</span><br><span>diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile</span><br><span>index e33748a..7a294a4 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -28,7 +28,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-pcu/patch?h=$OSMO_PCU_BRANCH /tmp/commit-osmo-pcu</span><br><span> </span><br><span> RUN cd osmo-pcu && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_PCU_BRANCH origin/$OSMO_PCU_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_PCU_BRANCH $OSMO_PCU_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-trx && \</span><br><span>diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index 87513cc..c373564 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -32,7 +32,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-sgsn/patch?h=$OSMO_SGSN_BRANCH /tmp/commit</span><br><span> </span><br><span> RUN cd osmo-sgsn && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_SGSN_BRANCH origin/$OSMO_SGSN_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_SGSN_BRANCH $OSMO_SGSN_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span>diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index 5854221..258b1fe 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -36,7 +36,7 @@</span><br><span> ADD http://git.osmocom.org/osmo-sip-connector/patch?h=$OSMO_SIP_BRANCH /tmp/commit-osmo-sip-connector</span><br><span> </span><br><span> RUN cd osmo-sip-connector && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_SIP_BRANCH origin/$OSMO_SIP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_SIP_BRANCH $OSMO_SIP_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-smpp --enable-iu && \</span><br><span>diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile</span><br><span>index 7c59fb0..0a62ed7 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -26,7 +26,7 @@</span><br><span> RUN git clone git://git.osmocom.org/libosmo-sccp.git</span><br><span> ADD http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit</span><br><span> RUN cd libosmo-sccp && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && git checkout -f -B $OSMO_STP_BRANCH origin/$OSMO_STP_BRANCH && \</span><br><span style="color: hsl(120, 100%, 40%);">+ git fetch && git checkout -f -B $OSMO_STP_BRANCH $OSMO_STP_BRANCH && \</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13779">change 13779</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/13779"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869 </div>
<div style="display:none"> Gerrit-Change-Number: 13779 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Daniel Willmann <dwillmann@sysmocom.de> </div>