osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/43078?usp=email )
Change subject: Install osmo-python-tests with pip ......................................................................
Install osmo-python-tests with pip
Use pip to install osmo-python-tests instead of calling setup.py, so it works with modern python packaging as well.
Related: osmo-python-tests I186544163ab02834c33f1363f3a06cd380898f56 Change-Id: I9bb5d13897dbf1be9855c4eba29c6b3a2c35729c --- M debian-bookworm-build-arm/Dockerfile M debian-bookworm-build/Dockerfile M debian-bookworm-titan-master/Dockerfile M debian-bookworm-titan/Dockerfile M debian-trixie-build-arm/Dockerfile M debian-trixie-build/Dockerfile 6 files changed, 16 insertions(+), 36 deletions(-)
Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve
diff --git a/debian-bookworm-build-arm/Dockerfile b/debian-bookworm-build-arm/Dockerfile index a6a1b21..7739afc 100644 --- a/debian-bookworm-build-arm/Dockerfile +++ b/debian-bookworm-build-arm/Dockerfile @@ -54,6 +54,7 @@ make \ pkg-config \ python3-minimal \ + python3-pip \ python3-setuptools \ sdcc \ stow \ @@ -62,12 +63,8 @@
# Install osmo-python-tests ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit -RUN set -x && \ - git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ - cd osmo-python-tests && \ - python3 setup.py clean build install && \ - cd .. && \ - rm -rf osmo-python-tests +RUN pip3 install --break-system-packages \ + 'git+https://gerrit.osmocom.org/python/osmo-python-tests'
# Install osmo-ci.git/scripts to /usr/local/bin ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index b82fc25..7ba0572 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -197,12 +197,8 @@
# Install osmo-python-tests ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit -RUN set -x && \ - git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ - cd osmo-python-tests && \ - python3 setup.py clean build install && \ - cd .. && \ - rm -rf osmo-python-tests +RUN pip3 install --break-system-packages \ + 'git+https://gerrit.osmocom.org/python/osmo-python-tests'
# Install osmo-ci.git/scripts to /usr/local/bin ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit diff --git a/debian-bookworm-titan-master/Dockerfile b/debian-bookworm-titan-master/Dockerfile index 8c322fe..d292efe 100644 --- a/debian-bookworm-titan-master/Dockerfile +++ b/debian-bookworm-titan-master/Dockerfile @@ -24,6 +24,7 @@ iputils-ping \ netcat-openbsd \ procps \ + python3-pip \ python3-setuptools \ tcpdump \ vim \ @@ -43,12 +44,8 @@
# Install osmo-python-tests (for obtaining talloc reports from SUT) ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit -RUN set -x && \ - git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ - cd osmo-python-tests && \ - python3 setup.py clean build install && \ - cd .. && \ - rm -rf osmo-python-tests +RUN pip3 install --break-system-packages \ + 'git+https://gerrit.osmocom.org/python/osmo-python-tests'
# Configure git RUN git config --global user.email docker@dock.er && \ diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile index 8a85044..ba07550 100644 --- a/debian-bookworm-titan/Dockerfile +++ b/debian-bookworm-titan/Dockerfile @@ -25,6 +25,7 @@ iputils-ping \ netcat-openbsd \ procps \ + python3-pip \ python3-setuptools \ tcpdump \ vim \ @@ -48,12 +49,8 @@
# Install osmo-python-tests (for obtaining talloc reports from SUT) ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit -RUN set -x && \ - git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ - cd osmo-python-tests && \ - python3 setup.py clean build install && \ - cd .. && \ - rm -rf osmo-python-tests +RUN pip3 install --break-system-packages \ + 'git+https://gerrit.osmocom.org/python/osmo-python-tests'
# Configure git RUN git config --global user.email docker@dock.er && \ diff --git a/debian-trixie-build-arm/Dockerfile b/debian-trixie-build-arm/Dockerfile index cd462c3..acf825f 100644 --- a/debian-trixie-build-arm/Dockerfile +++ b/debian-trixie-build-arm/Dockerfile @@ -56,6 +56,7 @@ make \ pkg-config \ python3-minimal \ + python3-pip \ python3-setuptools \ stow \ && \ @@ -63,12 +64,8 @@
# Install osmo-python-tests ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit -RUN set -x && \ - git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ - cd osmo-python-tests && \ - python3 setup.py clean build install && \ - cd .. && \ - rm -rf osmo-python-tests +RUN pip3 install --break-system-packages \ + 'git+https://gerrit.osmocom.org/python/osmo-python-tests'
# Install osmo-ci.git/scripts to /usr/local/bin ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit diff --git a/debian-trixie-build/Dockerfile b/debian-trixie-build/Dockerfile index 0a7affd..58cd9c1 100644 --- a/debian-trixie-build/Dockerfile +++ b/debian-trixie-build/Dockerfile @@ -205,12 +205,8 @@
# Install osmo-python-tests ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit -RUN set -x && \ - git clone --depth=1 https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests && \ - cd osmo-python-tests && \ - python3 setup.py clean build install && \ - cd .. && \ - rm -rf osmo-python-tests +RUN pip3 install --break-system-packages \ + 'git+https://gerrit.osmocom.org/python/osmo-python-tests'
# Install osmo-ci.git/scripts to /usr/local/bin ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit