pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29421 )

Change subject: Use gerrit as osmo-ttcn3-hacks.git git remote ......................................................................

Use gerrit as osmo-ttcn3-hacks.git git remote

Other remotes are mirrors of gerrit one, which means there's some delay between pushing some ref to the gerrit remote and having them available in the mirrors. Hence, it becomes annoying while developing and new stuff to test is pushed. Let's simply use gerrit since it's the master remote.

Change-Id: Ic87c196f8b91a3a3e6ddde2cca36482ce7070df7 --- M debian-bullseye-titan/Dockerfile M ttcn3-bsc-test-vamos/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-cbc-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-hnbgw-test/Dockerfile M ttcn3-hnodeb-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-ns-test/Dockerfile M ttcn3-pcap-client-test/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-pgw-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 25 files changed, 26 insertions(+), 26 deletions(-)

Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved

diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index f636003..49650a0 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -57,9 +57,9 @@ git config --global user.name "Dock Er"

# clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) -RUN git clone https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks && \ +RUN git clone https://gerrit.osmocom.org/osmo-ttcn3-hacks && \ make -j8 -C /osmo-ttcn3-hacks deps -ADD https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/raw/branch/master/deps/Make... /tmp/deps-Makefile +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/refs/heads/mas... /tmp/deps-Makefile RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ cd /osmo-ttcn3-hacks && \ git pull && \ diff --git a/ttcn3-bsc-test-vamos/Dockerfile b/ttcn3-bsc-test-vamos/Dockerfile index a29e000..eac8f46 100644 --- a/ttcn3-bsc-test-vamos/Dockerfile +++ b/ttcn3-bsc-test-vamos/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc

VOLUME /data diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index a29e000..eac8f46 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc

VOLUME /data diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 15e7727..07377c8 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc-nat

VOLUME /data diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index b115000..386ac3b 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts

VOLUME /data diff --git a/ttcn3-cbc-test/Dockerfile b/ttcn3-cbc-test/Dockerfile index 7c1e6c5..4048f20 100644 --- a/ttcn3-cbc-test/Dockerfile +++ b/ttcn3-cbc-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" cbc

VOLUME /data diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 11589f6..f237e8b 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" fr fr-net

VOLUME /data diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index a2216b2..c215d62 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy

VOLUME /data diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 252e893..36778c9 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_tests

VOLUME /data diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index ac5ca4f..e8b80a8 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hlr

VOLUME /data diff --git a/ttcn3-hnbgw-test/Dockerfile b/ttcn3-hnbgw-test/Dockerfile index 4dd0d1b..c37e1bf 100644 --- a/ttcn3-hnbgw-test/Dockerfile +++ b/ttcn3-hnbgw-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hnbgw

VOLUME /data diff --git a/ttcn3-hnodeb-test/Dockerfile b/ttcn3-hnodeb-test/Dockerfile index 2071cab..6783abd 100644 --- a/ttcn3-hnodeb-test/Dockerfile +++ b/ttcn3-hnodeb-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hnodeb

VOLUME /data diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index c8eeb2b..bfc0b9e 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" mgw

VOLUME /data diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 8c67bbf..9bcd891 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc

VOLUME /data diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 3155271..12ebee4 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sysinfo

VOLUME /data diff --git a/ttcn3-ns-test/Dockerfile b/ttcn3-ns-test/Dockerfile index b94de1b..d39f493 100644 --- a/ttcn3-ns-test/Dockerfile +++ b/ttcn3-ns-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ns

VOLUME /data diff --git a/ttcn3-pcap-client-test/Dockerfile b/ttcn3-pcap-client-test/Dockerfile index 9e66326..10c829b 100644 --- a/ttcn3-pcap-client-test/Dockerfile +++ b/ttcn3-pcap-client-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcap-client

VOLUME /data diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index b7cb21a..e97ac40 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcu

VOLUME /data diff --git a/ttcn3-pgw-test/Dockerfile b/ttcn3-pgw-test/Dockerfile index 23ef387..5233c5e 100644 --- a/ttcn3-pgw-test/Dockerfile +++ b/ttcn3-pgw-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pgw

VOLUME /data diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index e94c55c..b902e2d 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" remsim

VOLUME /data diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index f43a5dd..68fd2c0 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp

VOLUME /data diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index b581b43..da67044 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sgsn

VOLUME /data diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 7dd4756..53d70db 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sip

VOLUME /data diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 0d5b0da..f5dd890 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" smlc

VOLUME /data diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 7808704..256132d 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -3,7 +3,7 @@ FROM $REGISTRY/$USER/debian-bullseye-titan ARG OSMO_TTCN3_BRANCH="master"

-ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_BR... /tmp/commit RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" stp

VOLUME /data