Harald Welte has submitted this change and it was merged. Change subject: ttcn3-*-test: Remove cherry-pick of CCM related HACK ......................................................................
ttcn3-*-test: Remove cherry-pick of CCM related HACK This is no longer needed as the fix for https://osmocom.org/issues/2718 has been merged to master of osmo-ttcn3-hacks Change-Id: Ia0c1c134405fdbce1c65059d705827f1a643e774 Related: OS#2718 --- M ttcn3-bsc-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile 6 files changed, 0 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 0a4b4e6..4f0c606 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -16,7 +16,6 @@ RUN cd osmo-ttcn3-hacks && \ git fetch && \ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ - git cherry-pick 5ce5241d6d460e9b36a908ac7072d8ea68df08db && \ make bsc VOLUME /data diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 0c82ff1..43ed4f0 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -17,7 +17,6 @@ git fetch && \ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ make deps-update bts - #git cherry-pick 5ce5241d6d460e9b36a908ac7072d8ea68df08db && \ VOLUME /data diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index a6ffb05..8a920a6 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -17,7 +17,6 @@ git fetch && \ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ make deps-update hlr - #git cherry-pick 5ce5241d6d460e9b36a908ac7072d8ea68df08db && \ VOLUME /data diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index e2a4310..315638f 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -16,7 +16,6 @@ RUN cd osmo-ttcn3-hacks && \ git fetch && \ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ - git cherry-pick 5ce5241d6d460e9b36a908ac7072d8ea68df08db && \ make msc VOLUME /data diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 23117c4..dfca1c4 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -16,7 +16,6 @@ RUN cd osmo-ttcn3-hacks && \ git fetch && \ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ - git cherry-pick 5ce5241d6d460e9b36a908ac7072d8ea68df08db && \ make sgsn VOLUME /data diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index b03d494..d443d29 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -16,7 +16,6 @@ RUN cd osmo-ttcn3-hacks && \ git fetch && \ git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ - git cherry-pick 5ce5241d6d460e9b36a908ac7072d8ea68df08db && \ make sip VOLUME /data -- To view, visit https://gerrit.osmocom.org/7864 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0c1c134405fdbce1c65059d705827f1a643e774 Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Harald Welte <[email protected]> Gerrit-Reviewer: Harald Welte <[email protected]>
