Change in docker-playground[master]: debian-stretch-jenkins: install osmo-python-tests for python2

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

lynxis lazus gerrit-no-reply at lists.osmocom.org
Mon Aug 17 08:34:14 UTC 2020


lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19663 )

Change subject: debian-stretch-jenkins: install osmo-python-tests for python2
......................................................................

debian-stretch-jenkins: install osmo-python-tests for python2

osmo-python-tests for python2 is being used when building
old releases.

Change-Id: I63b3e92e745a664d5d0168c718daddae83c20df5
---
M debian-stretch-jenkins/Dockerfile
1 file changed, 17 insertions(+), 3 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  lynxis lazus: Verified



diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile
index 158f7d7..e73b7ae 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -100,6 +100,10 @@
 		python3-setuptools \
 		python3-usb \
 		python3-yaml \
+		python2.7 \
+		python-pip \
+		python-setuptools \
+		python-yaml \
 		rsync \
 		sdcc \
 		sqlite3 \
@@ -127,9 +131,19 @@
 RUN mkdir /build
 RUN chown build:build /build
 
-# Install osmo-python-tests
-ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit
-RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh
+# 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_TESTS_COMMIT /tmp/osmo-python-tests2-commit
+RUN git clone https://git.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
+RUN git clone https://git.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \
+	cd osmo-python-tests3 && \
+	python3 setup.py clean build install
 
 # 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/+/19663
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I63b3e92e745a664d5d0168c718daddae83c20df5
Gerrit-Change-Number: 19663
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200817/e4a29546/attachment.htm>


More information about the gerrit-log mailing list