July 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: jobs/update-osmo-ci: add ansicolor wrapper
by osmith 13 Jul '23

13 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33746 ) Change subject: jobs/update-osmo-ci: add ansicolor wrapper ...................................................................... jobs/update-osmo-ci: add ansicolor wrapper Change-Id: Ic94f2cc14b2af3a3711ac3eadec8c92b62006587 --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/46/33746/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 2d3cf07..e9f80b1 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -49,6 +49,11 @@ builders: - shell: './contrib/jenkins.sh' + + wrappers: + - ansicolor: + colormap: xterm + description: | <b>Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY!</b> -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic94f2cc14b2af3a3711ac3eadec8c92b62006587 Gerrit-Change-Number: 33746 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ci[master]: jobs: master/gerrit: use debian bookworm (12)
by osmith 13 Jul '23

13 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33744 ) Change subject: jobs: master/gerrit: use debian bookworm (12) ...................................................................... jobs: master/gerrit: use debian bookworm (12) Upgrade from debian 11 for master and debian 10 for gerrit verifications to using debian 12 for both. Previously we intentionally built against the older debian 10 version to ensure that our programs still build there. However it is easier to maintain the docker containers if we just use the most recent debian version for both and it makes the build environment more consistent - if a patch passes in gerrit verifications, we expect it to pass in master builds as well. And the other way around, I can just run CI of all master jobs when developing a change and assume that if they pass, gerrit verifications will run as well. As long as we provide binary packages in OBS for debian 11, 10, ... we will still notice if a build breaks on an older debian release. I think this is good enough given that it will probably not happen that often, but if we decide that we really want to ensure it still builds on older distros at gerrit-verification time then the more suitable place to add this would be in the deb-build verification test. It is more maintainable there, because the dependencies just get installed from the debian/control file, no need to add all of them to a docker container beforehand. The new container is debian-bookworm-build, see the docker-playground commit for reasoning why it is not debian-bookworm-jenkins. Related: OS#6057 Depends: docker-playground I49aaf62b5b97775f923453611df3b91354a640a0 Change-Id: I079e55a1325083714c8d39f922b2563e843fc0bc --- M jobs/gerrit-verifications-dahdi.yml M jobs/gerrit-verifications.yml M jobs/master-builds-dahdi.yml M jobs/master-builds.yml M scripts/osmo-ci-docker-rebuild.sh 5 files changed, 56 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/44/33744/1 diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml index 88971b8..5a8b3a6 100644 --- a/jobs/gerrit-verifications-dahdi.yml +++ b/jobs/gerrit-verifications-dahdi.yml @@ -91,7 +91,7 @@ -e "KSRC=/linux" \ -v "$PWD/dahdi-linux:/build" \ -v "$PWD/linux:/linux" \ - "$USER/debian-buster-jenkins" \ + "$USER/debian-bookworm-build" \ timeout 10m su build -c /build/contrib/jenkins.sh publishers: diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index bdc0ea7..c41d2a3 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -81,8 +81,8 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-buster-jenkins' - docker_img_erlang: '$USER/debian-bullseye-erlang' + docker_img: '$USER/debian-bookworm-build' + docker_img_erlang: '$USER/debian-bookworm-erlang' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418' @@ -128,6 +128,7 @@ - libusrp - openbsc: + docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -343,7 +344,6 @@ - simtrace2 - osmo-opencm3-projects: - docker_img: '$USER/debian-bullseye-jenkins' cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' pipeline_binpkgs: false @@ -357,6 +357,7 @@ - osmo-cbc - osmo-e1-recorder: + docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) pipeline_binpkgs: false - gapk: @@ -367,7 +368,9 @@ - osmo-el2tpd: pipeline_binpkgs: false - - osmo-smlc + - osmo-smlc: + docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-gbproxy - osmo-hnodeb diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml index 8a39c32..3d263e3 100644 --- a/jobs/master-builds-dahdi.yml +++ b/jobs/master-builds-dahdi.yml @@ -67,7 +67,7 @@ -e "KSRC=/linux" \ -v "$PWD/dahdi-linux:/build" \ -v "$PWD/linux:/linux" \ - "$USER/debian-buster-jenkins" \ + "$USER/debian-bookworm-build" \ timeout 10m su build -c /build/contrib/jenkins.sh publishers: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 5e962e8..4b1609a 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -65,7 +65,7 @@ -e CCACHE_DIR="/ccache" \ -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -v "$CCACHE_DIR:/ccache" \ - docker_img: '$USER/debian-bullseye-jenkins' + docker_img: '$USER/debian-bookworm-build' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' trigger: @@ -222,6 +222,7 @@ trigger: master-osmo-trx - openbsc: + docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -455,7 +456,6 @@ - docs_ftp.osmocom.org - osmo-opencm3-projects: git_base_url: https://gitea.osmocom.org/electronics - docker_img: '$USER/debian-bullseye-jenkins' cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de ssh: @@ -464,11 +464,13 @@ - osmo-e1d - osmo-cbc - - osmo-e1-recorder + - osmo-e1-recorder: + docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) - gapk - osmo-uecups - osmo-el2tpd - - osmo-smlc + - osmo-smlc: + docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) - osmo-gbproxy - osmo-hnodeb diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index ced9ce8..08b7cf1 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,14 +5,14 @@ case "$(arch)" in x86_64) + # debian-bullseye-jenkins: has python2 (OS#5950) docker_images_require \ - "debian-bullseye-erlang" \ - "debian-bullseye-jenkins" \ - "debian-buster-jenkins" + "debian-bookworm-build" \ + "debian-bookworm-erlang" \ + "debian-bullseye-jenkins" ;; arm*) docker_images_require \ - "debian-bullseye-jenkins-arm" \ - "debian-buster-jenkins-arm" + "debian-bookworm-build-arm" ;; esac -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I079e55a1325083714c8d39f922b2563e843fc0bc Gerrit-Change-Number: 33744 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs/update-osmo-ci: add branch parameters
by osmith 13 Jul '23

13 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33745 ) Change subject: jobs/update-osmo-ci: add branch parameters ...................................................................... jobs/update-osmo-ci: add branch parameters Add parameters to set the osmo-ci and docker-playground branch. I'm using this to test the debian 12 based containers before merging the changes to master. Related: OS#6057 Change-Id: I62265300048031cbb65e997b921373894500233f --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/33745/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 8ab1e12..2d3cf07 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -19,6 +19,18 @@ - build-discarder: days-to-keep: 30 num-to-keep: 120 + parameters: + - string: + name: OSMO_BRANCH_CI + description: | + osmo-ci.git branch + default: 'master' + - string: + # Used in scripts/common.sh:docker_images_require() + name: OSMO_BRANCH_DOCKER_PLAYGROUND + description: | + docker-playground.git branch + default: 'master' scm: - git: url: https://gerrit.osmocom.org/osmo-ci @@ -26,7 +38,7 @@ git-config-email: 'jenkins(a)osmocom.org' skip-tag: true branches: - - 'origin/master' + - '$OSMO_BRANCH_CI' wipe-workspace: true triggers: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I62265300048031cbb65e997b921373894500233f Gerrit-Change-Number: 33745 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: jenkins-common: add + set default: debian bookworm
by osmith 13 Jul '23

13 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33743 ) Change subject: jenkins-common: add + set default: debian bookworm ...................................................................... jenkins-common: add + set default: debian bookworm Related: OS#6057 Change-Id: I37e5393398f17c5c8809e17bb363fa86d769f2c2 --- M jenkins-common.sh 1 file changed, 22 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/43/33743/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index e70c217..20c1c4e 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -1,5 +1,6 @@ CACHE_DIR="$(realpath ../_cache)" KERNEL_TEST_DIR="$(realpath ../scripts/kernel-test)" +DEBIAN_DEFAULT="bookworm" docker_image_exists() { test -n "$(docker images -q "$REPO_USER/$1")" @@ -19,9 +20,9 @@ osmo-*-latest-centos8) echo "centos8-obs-latest" ;; osmo-*-centos7) echo "centos7-build" ;; osmo-*-centos8) echo "centos8-build" ;; - osmo-*-latest) echo "debian-bullseye-obs-latest" ;; - osmo-*) echo "debian-bullseye-build" ;; - open5gs-master) echo "debian-bullseye-build" ;; + osmo-*-latest) echo "debian-$DEBIAN_DEFAULT-obs-latest" ;; + osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; + open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;; ttcn3-*) echo "debian-bullseye-titan" ;; esac } @@ -33,7 +34,9 @@ centos7-*) echo "centos7" ;; centos8-*) echo "centos8" ;; debian-buster-*) echo "debian-buster" ;; - *) echo "debian-bullseye" ;; + debian-bullseye-*) echo "debian-bullseye" ;; + debian-bookworm-*) echo "debian-bookworm" ;; + *) echo "debian-$DEBIAN_DEFAULT" ;; esac } @@ -46,9 +49,12 @@ debian9-*) echo "debian:stretch" ;; debian10-*) echo "debian:buster" ;; debian11-*) echo "debian:bullseye" ;; + debian12-*) echo "debian:bookworm" ;; debian-stretch-*) echo "debian:stretch" ;; debian-buster-*) echo "debian:buster" ;; - *) echo "debian:bullseye" ;; + debian-bullseye-*) echo "debian:bullseye" ;; + debian-bookworm-*) echo "debian:bookworm" ;; + *) echo "debian:$DEBIAN_DEFAULT" ;; esac } @@ -354,7 +360,7 @@ -v $VOL_BASE_DIR:/data \ -v $CACHE_DIR:/cache \ --name ${BUILD_TAG}-cleaner \ - debian:bullseye \ + "debian:$DEBIAN_DEFAULT" \ chmod -R a+rX /data/ /cache/ } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I37e5393398f17c5c8809e17bb363fa86d769f2c2 Gerrit-Change-Number: 33743 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in docker-playground[master]: debian-bookworm-erlang: new docker container
by osmith 13 Jul '23

13 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33741 ) Change subject: debian-bookworm-erlang: new docker container ...................................................................... debian-bookworm-erlang: new docker container Related: OS#6057 Change-Id: I797ec0e6700860be8fb59bf6b1fab6fa44e53421 --- A debian-bookworm-erlang/Dockerfile A debian-bookworm-erlang/Makefile 2 files changed, 81 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/33741/1 diff --git a/debian-bookworm-erlang/Dockerfile b/debian-bookworm-erlang/Dockerfile new file mode 100644 index 0000000..0c13fd5 --- /dev/null +++ b/debian-bookworm-erlang/Dockerfile @@ -0,0 +1,68 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_12/" +ARG UID + +# Install the erlang vm and rebar (2) +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + erlang \ + rebar \ + && \ + apt-get clean + +# Add rebar3 +ARG REBAR3_VERSION="3.18.0" +ADD https://github.com/erlang/rebar3/archive/refs/tags/${REBAR3_VERSION}.tar.gz /tmp/rebar3.tar.gz +RUN set -x && \ + tar -zxf /tmp/rebar3.tar.gz && \ + cd rebar3-${REBAR3_VERSION} && \ + ./bootstrap && \ + install -Dm0755 "rebar3" "/usr/bin/rebar3" && \ + rm /tmp/rebar3.tar.gz + +# Install minimal build utilities as well as system utilities +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ + git \ + procps \ + tcpdump \ + vim \ + netcat-openbsd \ + wget \ + && \ + apt-get clean + +# Install additional C-language / system dependencies of our Erlang projects +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + libpcap-dev \ + && \ + apt-get clean + +# Add osmocom latest repo, should we ever require packages from there +COPY .common/Release.key /usr/share/keyrings/osmocom-latest.asc +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + gnupg \ + && \ + apt-get clean && \ + echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list + +# Add a non-root user under which we will normaly execute build tests +RUN useradd --uid=${UID} -m build +WORKDIR /home/build +USER build diff --git a/debian-bookworm-erlang/Makefile b/debian-bookworm-erlang/Makefile new file mode 100644 index 0000000..cdac90c --- /dev/null +++ b/debian-bookworm-erlang/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I797ec0e6700860be8fb59bf6b1fab6fa44e53421 Gerrit-Change-Number: 33741 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: debian-bookworm-obs-latest: new container
by osmith 13 Jul '23

13 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33742 ) Change subject: debian-bookworm-obs-latest: new container ...................................................................... debian-bookworm-obs-latest: new container Related: OS#6057 Change-Id: Ie30135362e37558010f9894bb80a3684786f5aee --- A debian-bookworm-obs-latest/Dockerfile A debian-bookworm-obs-latest/Makefile 2 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/42/33742/1 diff --git a/debian-bookworm-obs-latest/Dockerfile b/debian-bookworm-obs-latest/Dockerfile new file mode 100644 index 0000000..cd44fcc --- /dev/null +++ b/debian-bookworm-obs-latest/Dockerfile @@ -0,0 +1,26 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_12/" + +# Copy from common dir +COPY .common/respawn.sh /usr/local/bin/respawn.sh +COPY .common/Release.key /usr/share/keyrings/osmocom-latest.asc + +# Configure Osmocom latest repository, add telnet for debugging +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + telnet \ + && \ + apt-get clean && \ + echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list + +# Invalidate cache once the repository is updated +ADD $OSMOCOM_REPO/Release /tmp/Release diff --git a/debian-bookworm-obs-latest/Makefile b/debian-bookworm-obs-latest/Makefile new file mode 100644 index 0000000..cdac90c --- /dev/null +++ b/debian-bookworm-obs-latest/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie30135362e37558010f9894bb80a3684786f5aee Gerrit-Change-Number: 33742 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in docker-playground[master]: debian-bookworm-build(-arm): new docker containers
by osmith 13 Jul '23

13 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33740 ) Change subject: debian-bookworm-build(-arm): new docker containers ...................................................................... debian-bookworm-build(-arm): new docker containers Create debian bookworm (12) based containers for building all Osmocom projects in master/gerrit/ttcn3 jenkins jobs. This is a combination of debian-bullseye-build (ttcn3) and debian-bullseye-jenkins(-arm) (master/gerrit), which were used for this purpose but had several differences. Combining them solves the following problems: * The naming was confusing, as both the -jenkins and -build containers were used in jenkins and were used to build the Osmocom stack. * This lead to adding the dependencies to the wrong containers / not adding them to both containers. * Now we are sure that if a program builds from source in the master and gerrit verifications, it will also build in the ttcn3 jobs. Other notable changes from the debian 11 containers: * Python2 is finally gone (OS#5950, for the few projects that still need it like openbsc, I'll use debian 11 for the jenkins jobs) * Removed osc and git-buildpackage, now that OBS package building is done in different docker containers (see osmo-ci/scripts/obs) * Combined multiple RUN commands into one as they the image build down, used set -x to display what commands run exactly * Use UID variable instead of hardcoding 1000 * Optimized order of commands, so e.g. the LLVM for Arm that we will rarely change gets installed/cached before the big list of apt pkgs * Replaced old git.osmocom.org urls * Removed apt-get upgrade; the base image will get upgraded from time to time, no need to upgrade within the image * Add --depth=1 option to git clones and remove temporary git clones * Removed generating locales code, it was only done by one of the two images and I couldn't find in the git log why we would need this (if we do need it we can add it back later) The following patches add more debian bookworm containers and have similar improvements. Related: OS#6057 Change-Id: I49aaf62b5b97775f923453611df3b91354a640a0 --- A debian-bookworm-build-arm/Dockerfile A debian-bookworm-build-arm/Makefile A debian-bookworm-build/Dockerfile A debian-bookworm-build/Makefile 4 files changed, 355 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/33740/1 diff --git a/debian-bookworm-build-arm/Dockerfile b/debian-bookworm-build-arm/Dockerfile new file mode 100644 index 0000000..9a4b2b4 --- /dev/null +++ b/debian-bookworm-build-arm/Dockerfile @@ -0,0 +1,89 @@ +# Image used to run contrib/jenkins.sh scripts of a few Osmocom projects on +# arm. Keep this image minimal so the rpis don't need forever to build it. +# See master-builds.yml, gerrit-verifications.yml in osmo-ci.git. +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_12/" +ARG UID + +# Copy from common dir +COPY .common/Release.key /etc/apt/trusted.gpg.d/obs.osmocom.org.asc + +# Configure build user, disable installing man pages +# * man pages: without them we avoid waiting for "generating manpages" +RUN set -x && \ + useradd --uid=${UID} build && \ + mkdir /build && \ + chown -R build:build /build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + +# Install packages from Debian repositories (alphabetic order) +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + bzip2 \ + ca-certificates \ + ccache \ + g++ \ + gcc \ + git \ + libboost-dev \ + libboost-filesystem-dev \ + libboost-program-options-dev \ + libboost-thread-dev \ + libfftw3-dev \ + libgnutls28-dev \ + libmnl-dev \ + libortp-dev \ + libpcsclite-dev \ + libsctp-dev \ + libtalloc-dev \ + libtool \ + liburing-dev \ + libusb-1.0-0-dev \ + make \ + pkg-config \ + python3-minimal \ + python3-setuptools \ + sdcc \ + stow \ + && \ + apt-get clean + +# Install osmo-python-tests +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /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 && \ + rm -rf 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 +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci osmo-ci && \ + su build -c "cd osmo-ci/scripts && cp -v *.sh *.py /usr/local/bin" && \ + rm -rf osmo-ci + +# Install packages from Osmocom OBS nightly repository +# * osmo-trx: liblimesuite-dev, libuhd-dev +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-nightly.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + liblimesuite-dev \ + libuhd-dev \ + && \ + apt-get clean diff --git a/debian-bookworm-build-arm/Makefile b/debian-bookworm-build-arm/Makefile new file mode 100644 index 0000000..cdac90c --- /dev/null +++ b/debian-bookworm-build-arm/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm +include ../make/Makefile diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile new file mode 100644 index 0000000..f717241 --- /dev/null +++ b/debian-bookworm-build/Dockerfile @@ -0,0 +1,215 @@ +# Image for building all Osmocom projects in master/gerrit/ttcn3 jenkins jobs +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} + +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_12/" +ARG UID +ARG LLVM_VERSION="14.0.0" + +# Copy from common dir +COPY .common/respawn.sh /usr/local/bin/respawn.sh +COPY .common/Release.key /etc/apt/trusted.gpg.d/obs.osmocom.org.asc + +# Configure build user, disable installing man pages +# * /usr/local: osmo-python-tests's contrib/jenkins.sh writes there +# * man pages: without them we avoid waiting for "generating manpages" +RUN set -x && \ + useradd --uid=${UID} build && \ + mkdir /build && \ + chown -R build:build /build /usr/local && \ + \ + echo "path-exclude=/usr/share/man/*" \ + > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ + rm -rf /usr/share/man/ + +# Install LLVM-embedded-toolchain-for-Arm +RUN if [ "$(arch)" != "x86_64" ]; then \ + echo "ERROR: use debian-bookworm-build-arm instead"; \ + exit 1; \ + fi && \ + set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + libtinfo5 \ + wget \ + && \ + apt-get clean && \ + wget https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/do… && \ + tar -xf LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + rm LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + mv LLVMEmbeddedToolchainForArm-${LLVM_VERSION} /opt/llvm-arm && \ + /opt/llvm-arm/bin/clang --version && \ + /opt/llvm-arm/bin/clang --print-targets + +# Install packages from Debian repositories (alphabetic order) +RUN set -x && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + asciidoc \ + asciidoc-dblatex \ + autoconf \ + autoconf-archive \ + autogen \ + automake \ + bc \ + bison \ + build-essential \ + bzip2 \ + ca-certificates \ + ccache \ + cmake \ + coccinelle \ + cppcheck \ + dahdi-source \ + dblatex \ + dbus \ + debhelper \ + devscripts \ + dh-autoreconf \ + docbook5-xml \ + doxygen \ + equivs \ + flex \ + g++ \ + gawk \ + gcc \ + gcc-arm-none-eabi \ + ghostscript \ + git \ + gnupg \ + graphviz \ + htop \ + inkscape \ + iproute2 \ + latexmk \ + lcov \ + libaio-dev \ + libasound2-dev \ + libboost-all-dev \ + libc-ares-dev \ + libcdk5-dev \ + libcsv-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libelf-dev \ + libffi-dev \ + libfftw3-dev \ + libgmp-dev \ + libgnutls28-dev \ + libgps-dev \ + libgsm1-dev \ + libjansson-dev \ + liblua5.3-dev \ + libmnl-dev \ + libncurses5-dev \ + libnewlib-arm-none-eabi \ + libnl-3-dev \ + libnl-route-3-dev \ + liboping-dev \ + libortp-dev \ + libpcap-dev \ + libpcsclite-dev \ + libreadline-dev \ + libsctp-dev \ + libsigsegv-dev \ + libsnmp-dev \ + libsofia-sip-ua-glib-dev \ + libsqlite3-dev \ + libssl-dev \ + libtalloc-dev \ + libtinfo5 \ + libtool \ + liburing-dev \ + libusb-1.0-0-dev \ + libusb-dev \ + libxml2-utils \ + libzmq3-dev \ + locales \ + lua-socket \ + make \ + mscgen \ + ofono \ + openssh-client \ + patchelf \ + picolibc-arm-none-eabi \ + pkg-config \ + python3 \ + python3-gi \ + python3-mako \ + python3-nwdiag \ + python3-pip \ + python3-pyflakes \ + python3-setuptools \ + python3-usb \ + python3-yaml \ + rsync \ + sdcc \ + source-highlight \ + sqlite3 \ + stow \ + sudo \ + swig \ + systemd \ + tcpdump \ + telnet \ + tex-gyre \ + texinfo \ + unzip \ + xsltproc \ + && \ + apt-get clean + +# Install pip dependencies (alphabetic order) +# break-system-packages: inside docker it's fine to install pkgs system-wide +ADD https://gitea.osmocom.org/sim-card/pysim/raw/branch/master/requirements.txt /tmp/pysim_requirements.txt +RUN set -x && \ + cat /tmp/pysim_requirements.txt && \ + pip3 install --break-system-packages \ + 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git' \ + 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ + 'git+https://github.com/podshumok/python-smpplib.git' \ + 'pydbus' \ + 'pylint' \ + 'pysispm' \ + 'sphinx' \ + 'sphinxcontrib-napoleon' \ + -r /tmp/pysim_requirements.txt + +# Install osmo-python-tests +ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/maste… /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 && \ + rm -rf 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 +RUN set -x && \ + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci osmo-ci && \ + su build -c "cd osmo-ci/scripts && cp -v *.sh *.py /usr/local/bin" && \ + rm -rf osmo-ci + +# Install osmo-gsm-manuals to /opt/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 --depth=1 https://gerrit.osmocom.org/osmo-gsm-manuals + +# Install packages from Osmocom OBS nightly repository +# * osmo-remsim: libulfius +# * osmo-trx: liblimesuite-dev, libuhd-dev +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN set -x && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO ./" \ + > /etc/apt/sources.list.d/osmocom-nightly.list && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + liblimesuite-dev \ + libuhd-dev \ + libulfius-dev \ + && \ + apt-get clean diff --git a/debian-bookworm-build/Makefile b/debian-bookworm-build/Makefile new file mode 100644 index 0000000..cdac90c --- /dev/null +++ b/debian-bookworm-build/Makefile @@ -0,0 +1,3 @@ +UPSTREAM_DISTRO=debian:bookworm +DISTRO=debian-bookworm +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I49aaf62b5b97775f923453611df3b91354a640a0 Gerrit-Change-Number: 33740 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pySim/cards: Add type annotations
by fixeria 13 Jul '23

13 Jul '23

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33692 ) Change subject: pySim/cards: Add type annotations ...................................................................... Patch Set 6: (1 comment) File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/33692/comment/a3ac6ede_41ea504d PS6, Line 36: def __init__(self, scc: LinkBase): > I wonder if the constructor might also need an annotation for the returned type (-> None)? PEP-0484 says we should ("ought"), but it's not strictly necessary, see: https://stackoverflow.com/a/73334605/10668583. Personally I always omit `-> None` in constructors. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id5752a64b59097584301c860ebf74d858ed3d240 Gerrit-Change-Number: 33692 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Jul 2023 12:52:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: USRPDevice:updateAlignment: remove byteswap code
by Hoernchen 13 Jul '23

13 Jul '23

Attention is currently required from: osmith. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33737 ) Change subject: USRPDevice:updateAlignment: remove byteswap code ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > union { […] Ignore the comment.. that was part of a comment for the previous change. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I806d8c1432cb20efca1830a2752a4cbc70384b54 Gerrit-Change-Number: 33737 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Jul 2023 12:43:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: USRPDevice:updateAlignment: remove byteswap code
by Hoernchen 13 Jul '23

13 Jul '23

Attention is currently required from: osmith. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33737 ) Change subject: USRPDevice:updateAlignment: remove byteswap code ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: union { short data[4] = {0x00, 0x02, 0x00, 0x00}; uint32_t d4[2]; }; uint32_t *wordPtr = &d4[0]; *wordPtr = host_to_usrp_u32(*wordPtr); might work, at least the compiler does not complain, but -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I806d8c1432cb20efca1830a2752a4cbc70384b54 Gerrit-Change-Number: 33737 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Jul 2023 12:41:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0