osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40261?usp=email ) Change subject: Fix remaining users of deprecated git.osmocom.org ...................................................................... Fix remaining users of deprecated git.osmocom.org git.osmocom.org is deprecated and will be removed at some point. Make sure we don't use it anywhere in our docker containers. Notably this drops the following line without replacement: ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit This was not needed, because the patch for OSMO_PYTHON2_TESTS_COMMIT will never change, it points to a commit hash (unlike checking master, where the patch can change). Change-Id: I2c7ab8fe9e87dd973df44ae1c5ff90930627040c --- M README.md M debian-bullseye-jenkins-arm/Dockerfile M debian-bullseye-jenkins/Dockerfile M debian-buster-jenkins-arm/Dockerfile M debian-buster-jenkins/Dockerfile M debian-sid-jenkins/Dockerfile 6 files changed, 15 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/61/40261/1 diff --git a/README.md b/README.md index 314c91e..eeb9272 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ * `IMAGE_SUFFIX`: the version of the Osmocom stack to run the testsuite against. Default is `master`, set this to `latest` to test the last stable releases. -* `OSMO_TTCN3_BRANCH`: [osmo-ttcn3-hacks.git](https://git.osmocom.org/osmo-ttcn3-hacks/) +* `OSMO_TTCN3_BRANCH`: [osmo-ttcn3-hacks.git](https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks) branch, which will be used when building a `ttcn3-*` docker image. Defaults to `master`. * `OSMO_BSC_BRANCH`, `OSMO_MSC_BRANCH`, ...: branch of the appropriate diff --git a/debian-bullseye-jenkins-arm/Dockerfile b/debian-bullseye-jenkins-arm/Dockerfile index 31958ab..f18dc61 100644 --- a/debian-bullseye-jenkins-arm/Dockerfile +++ b/debian-bullseye-jenkins-arm/Dockerfile @@ -51,13 +51,13 @@ RUN chown build:build /build # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ diff --git a/debian-bullseye-jenkins/Dockerfile b/debian-bullseye-jenkins/Dockerfile index 5132c0a..aadb338 100644 --- a/debian-bullseye-jenkins/Dockerfile +++ b/debian-bullseye-jenkins/Dockerfile @@ -165,20 +165,19 @@ # Install osmo-python-tests for python2 (OS#5950) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed -ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ @@ -186,7 +185,7 @@ /usr/local/bin # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals -ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals # Set a UTF-8 locale diff --git a/debian-buster-jenkins-arm/Dockerfile b/debian-buster-jenkins-arm/Dockerfile index f0d5379..c918b15 100644 --- a/debian-buster-jenkins-arm/Dockerfile +++ b/debian-buster-jenkins-arm/Dockerfile @@ -50,13 +50,13 @@ RUN chown build:build /build # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 44c382d..f0bb6c7 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -162,20 +162,19 @@ # Install osmo-python-tests for python2 (when building old tags again new releases) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed -ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ @@ -183,7 +182,7 @@ /usr/local/bin # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals -ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals # Set a UTF-8 locale diff --git a/debian-sid-jenkins/Dockerfile b/debian-sid-jenkins/Dockerfile index bb66f13..5650192 100644 --- a/debian-sid-jenkins/Dockerfile +++ b/debian-sid-jenkins/Dockerfile @@ -138,20 +138,19 @@ # Install osmo-python-tests for python2 (when building old tags again new releases) ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed -ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TES… /tmp/osmo-python-tests2-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \ cd osmo-python-tests2 && \ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \ python2 setup.py clean build install # Install osmo-python-tests for python3 -ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /tmp/osmo-python-tests-commit RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \ cd osmo-python-tests3 && \ python3 setup.py clean build install # Install osmo-ci.git/scripts to /usr/local/bin -ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit RUN git clone https://gerrit.osmocom.org/osmo-ci osmo-ci && \ cp -v $(find osmo-ci/scripts \ -maxdepth 1 \ @@ -159,8 +158,8 @@ /usr/local/bin # Install osmo-gsm-manuals to /opt/osmo-gsm-manuals -ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit -RUN git -C /opt clone https://git.osmocom.org/osmo-gsm-manuals +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit +RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals # Set a UTF-8 locale RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40261?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2c7ab8fe9e87dd973df44ae1c5ff90930627040c Gerrit-Change-Number: 40261 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>