pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26784 ) Change subject: Use osmo-hnbgw from osmo-hnbgw.git instead of osmo-iuh.git ...................................................................... Use osmo-hnbgw from osmo-hnbgw.git instead of osmo-iuh.git Starting with release 1.2.0 of both repos, osmo-hnbgw binary is in osmo-hnbgw.git, not osmo-iuh.git anymore. Change-Id: I4ac6ede6a5b25ada211674bf3c46d79d7720a4bc --- M make/Makefile M osmo-bisect.sh M osmo-hnbgw-master/Dockerfile 3 files changed, 12 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/make/Makefile b/make/Makefile index 8bd360d..e314618 100644 --- a/make/Makefile +++ b/make/Makefile @@ -26,6 +26,7 @@ OSMO_GGSN_BRANCH?=master OSMO_GSM_TESTER_BRANCH?=master OSMO_HLR_BRANCH?=master +OSMO_HNBGW_BRANCH?=master OSMO_HNODEB_BRANCH?=master OSMO_IUH_BRANCH?=master OSMO_MGW_BRANCH?=master @@ -101,6 +102,7 @@ --build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \ --build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \ --build-arg OSMO_HLR_BRANCH=$(OSMO_HLR_BRANCH) \ + --build-arg OSMO_HNBGW_BRANCH=$(OSMO_HNBGW_BRANCH) \ --build-arg OSMO_HNODEB_BRANCH=$(OSMO_HNODEB_BRANCH) \ --build-arg OSMO_IUH_BRANCH=$(OSMO_IUH_BRANCH) \ --build-arg OSMO_MGW_BRANCH=$(OSMO_MGW_BRANCH) \ diff --git a/osmo-bisect.sh b/osmo-bisect.sh index 5ca69cd..68ece72 100755 --- a/osmo-bisect.sh +++ b/osmo-bisect.sh @@ -20,10 +20,7 @@ COMMIT=$(git log -1 --format=format:%H) case $COMP_LOWER in - "hnbgw") - BRANCH="OSMO_IUH_BRANCH" - SUITE="ttcn3-hnbgw-test" - ;; + "hnbgw"|\ "bsc"|\ "bts"|\ "ggsn"|\ diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 9101e0c..06c16b2 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -10,19 +10,22 @@ libosmo-abis-dev \ libosmo-netif-dev \ libosmo-sigtran-dev \ + libosmo-ranap-dev \ + libosmo-rua-dev \ + libosmo-hnbap-dev \ libasn1c-dev && \ apt-get clean WORKDIR /tmp -ARG OSMO_IUH_BRANCH="master" +ARG OSMO_HNBGW_BRANCH="master" -RUN git clone git://git.osmocom.org/osmo-iuh.git -ADD http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-mgw +RUN git clone git://git.osmocom.org/osmo-hnbgw.git +ADD http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_HNBGW_BRANCH /tmp/commit-osmo-hnbgw -RUN cd osmo-iuh && \ - git fetch && git checkout $OSMO_IUH_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_IUH_BRANCH || exit 1); \ +RUN cd osmo-hnbgw && \ + git fetch && git checkout $OSMO_HNBGW_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_HNBGW_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4ac6ede6a5b25ada211674bf3c46d79d7720a4bc Gerrit-Change-Number: 26784 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged