osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28461 )
Change subject: release-tarball-build-dist: upgrade from debian 9
......................................................................
release-tarball-build-dist: upgrade from debian 9
Let it use debian bullseye and rename the directory once, so we don't
need to rename it in the future when switching the debian version
again.
The reason I'm doing this now is that building with debian 9 failed
due to obs.osmocom.org related changes. It would be trivial to fix that,
but I decided to rather upgrade to the latest debian version.
Change-Id: Ib6039724a7200abce5252f95407047296b72cd51
---
R release-tarball-build-dist/Dockerfile
R release-tarball-build-dist/Makefile
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/61/28461/1
diff --git a/debian-stretch-build-dist/Dockerfile b/release-tarball-build-dist/Dockerfile
similarity index 94%
rename from debian-stretch-build-dist/Dockerfile
rename to release-tarball-build-dist/Dockerfile
index e444ed5..bc0215e 100644
--- a/debian-stretch-build-dist/Dockerfile
+++ b/release-tarball-build-dist/Dockerfile
@@ -1,5 +1,5 @@
ARG USER
-FROM $USER/debian-stretch-obs-latest
+FROM $USER/debian-bullseye-obs-latest
# Arguments used after FROM must be specified again
RUN apt-get update && \
@@ -66,8 +66,6 @@
libzmq3-dev \
make \
mscgen \
- python-nwdiag \
- python-pychart \
python3-nwdiag \
xsltproc \
&& \
diff --git a/debian-stretch-build-dist/Makefile b/release-tarball-build-dist/Makefile
similarity index 100%
rename from debian-stretch-build-dist/Makefile
rename to release-tarball-build-dist/Makefile
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28461
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ib6039724a7200abce5252f95407047296b72cd51
Gerrit-Change-Number: 28461
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28455 )
Change subject: osmo-gsm-tester: use debian's soapysdr-module-lms7
......................................................................
osmo-gsm-tester: use debian's soapysdr-module-lms7
After switching from build.opensuse.org to obs.osmocom.org's published
packages, the soapysdr0.7-module-lms7 binary package we had does not
exist anymore.
I'm not sure where it came from, from the name it looks like it was
built from version 0.7 sources, but we only have a soapysdr_0.5.4
package in OBS that was added for debian 8/ubuntu 16.04 compatibility 4
years ago, and builds have been disabled for all architectures:
https://build.opensuse.org/package/show/network:osmocom:nightly/soapysdr
Instead of relying on this leftover binary package, use the one provided
by debian instead. This osmo-gsm-tester docker container is based on
debian-buster, which has soapysdr 0.6 packaged. If we should really need
0.7, we could switch it to bullseye or build it from source while
building the container, or add it back to obs.osmocom.org.
I verified that the container builds with this change.
Fix for:
E: Unable to locate package soapysdr0.7-module-lms7
Change-Id: Ie2408258eda407d9db6c2f0f5fbe475861756778
---
M osmo-gsm-tester/Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile
index 052c565..36fc20e 100644
--- a/osmo-gsm-tester/Dockerfile
+++ b/osmo-gsm-tester/Dockerfile
@@ -101,7 +101,7 @@
libuhd-dev \
libczmq-dev \
libsoapysdr-dev \
- soapysdr0.7-module-lms7 && \
+ soapysdr-module-lms7 && \
apt-get clean
# install gnuradio runtime dependencies
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28455
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ie2408258eda407d9db6c2f0f5fbe475861756778
Gerrit-Change-Number: 28455
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28457 )
Change subject: osmo-ci-docker-rebuild: don't always build osmo-gsm-tester
......................................................................
osmo-ci-docker-rebuild: don't always build osmo-gsm-tester
Currently there is only one jenkins node labeled as
osmo-gsm-tester-build. Build the osmo-gsm-tester container only there,
not on all x86_64 nodes.
The /var/tmp/osmo-gsm-tester/state directory is set up by
ansible/roles/gsm-tester/tasks/main.yml.
Related: https://jenkins.osmocom.org/jenkins/label/osmo-gsm-tester-build/
Change-Id: I9191d6d54d516ce75f3f576f34463dcaad22c85a
---
M scripts/osmo-ci-docker-rebuild.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh
index f46bec1..ed441fe 100755
--- a/scripts/osmo-ci-docker-rebuild.sh
+++ b/scripts/osmo-ci-docker-rebuild.sh
@@ -18,7 +18,7 @@
"debian-bullseye-erlang"
fi
-if [ "$(arch)" = "x86_64" ]; then
+if [ -d "/var/tmp/osmo-gsm-tester/state" ]; then
docker_images_require \
"osmo-gsm-tester"
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28457
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I9191d6d54d516ce75f3f576f34463dcaad22c85a
Gerrit-Change-Number: 28457
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged