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

[XS] Change in osmo-ci[master]: jobs/registry…: debian:buster -> debian/eol:buster
by osmith 14 Jul '25

14 Jul '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40658?usp=email ) Change subject: jobs/registry…: debian:buster -> debian/eol:buster ...................................................................... jobs/registry…: debian:buster -> debian/eol:buster Related: OS#6811 Change-Id: I6a9fdec0fa1063859e10cf5978cf6fd6b53619c1 --- M jobs/registry-update-base-images.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index d838f91..1b5ad97 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -26,7 +26,7 @@ - shell: | REGISTRY="registry.osmocom.org" IMAGES=" - debian:buster + debian/eol:buster debian:bullseye debian:bookworm debian:sid -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6a9fdec0fa1063859e10cf5978cf6fd6b53619c1 Gerrit-Change-Number: 40658 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/registry…: fix syntax error
by pespin 14 Jul '25

14 Jul '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40659?usp=email ) Change subject: jobs/registry…: fix syntax error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40659?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I54b11d0dd7847bd208c4e4270be3151479dac983 Gerrit-Change-Number: 40659 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Jul 2025 11:58:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/registry…: debian:buster -> debian/eol:buster
by pespin 14 Jul '25

14 Jul '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40658?usp=email ) Change subject: jobs/registry…: debian:buster -> debian/eol:buster ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6a9fdec0fa1063859e10cf5978cf6fd6b53619c1 Gerrit-Change-Number: 40658 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Jul 2025 11:57:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/registry…: add email parameter
by pespin 14 Jul '25

14 Jul '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40657?usp=email ) Change subject: jobs/registry…: add email parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie1e258b77ddb988e27b778cb8243cf33bb5f5440 Gerrit-Change-Number: 40657 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Jul 2025 11:57:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in docker-playground[master]: Use debian/eol:buster instead of debian:buster
by osmith 14 Jul '25

14 Jul '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/40660?usp=email ) Change subject: Use debian/eol:buster instead of debian:buster ...................................................................... Use debian/eol:buster instead of debian:buster Change-Id: Ic960320dcc6c5e8d8cc4d0bdf7541da4b692e10e --- M debian-buster-build/Dockerfile M debian-buster-build/Makefile M debian-buster-jenkins-arm/Makefile M debian-buster-jenkins/Makefile M debian-buster-obs-latest/Dockerfile M debian-buster-obs-latest/Makefile M debian10-obs-submit/Dockerfile M jenkins-common.sh 8 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/60/40660/1 diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 1059d3a..d629458 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=debian:buster +ARG UPSTREAM_DISTRO=debian/eol:buster FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" diff --git a/debian-buster-build/Makefile b/debian-buster-build/Makefile index 67066b3..8fd0302 100644 --- a/debian-buster-build/Makefile +++ b/debian-buster-build/Makefile @@ -1,3 +1,3 @@ -UPSTREAM_DISTRO=debian:buster +UPSTREAM_DISTRO=debian/eol:buster DISTRO=debian-buster include ../make/Makefile diff --git a/debian-buster-jenkins-arm/Makefile b/debian-buster-jenkins-arm/Makefile index ea61ed8..c63bf12 100644 --- a/debian-buster-jenkins-arm/Makefile +++ b/debian-buster-jenkins-arm/Makefile @@ -1,3 +1,3 @@ -UPSTREAM_DISTRO=debian:buster-slim +UPSTREAM_DISTRO=debian/eol:buster-slim DISTRO=debian-buster-slim include ../make/Makefile diff --git a/debian-buster-jenkins/Makefile b/debian-buster-jenkins/Makefile index 67066b3..8fd0302 100644 --- a/debian-buster-jenkins/Makefile +++ b/debian-buster-jenkins/Makefile @@ -1,3 +1,3 @@ -UPSTREAM_DISTRO=debian:buster +UPSTREAM_DISTRO=debian/eol:buster DISTRO=debian-buster include ../make/Makefile diff --git a/debian-buster-obs-latest/Dockerfile b/debian-buster-obs-latest/Dockerfile index 4a0d3b0..d46d2f5 100644 --- a/debian-buster-obs-latest/Dockerfile +++ b/debian-buster-obs-latest/Dockerfile @@ -1,5 +1,5 @@ ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=debian:buster +ARG UPSTREAM_DISTRO=debian/eol:buster FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again diff --git a/debian-buster-obs-latest/Makefile b/debian-buster-obs-latest/Makefile index 67066b3..8fd0302 100644 --- a/debian-buster-obs-latest/Makefile +++ b/debian-buster-obs-latest/Makefile @@ -1,3 +1,3 @@ -UPSTREAM_DISTRO=debian:buster +UPSTREAM_DISTRO=debian/eol:buster DISTRO=debian-buster include ../make/Makefile diff --git a/debian10-obs-submit/Dockerfile b/debian10-obs-submit/Dockerfile index bc3bbf7..31a0ad7 100644 --- a/debian10-obs-submit/Dockerfile +++ b/debian10-obs-submit/Dockerfile @@ -1,6 +1,6 @@ # Used by osmo-ci.git scripts/osmocom-packages-docker.sh ARG REGISTRY=docker.io -ARG UPSTREAM_DISTRO=debian:buster +ARG UPSTREAM_DISTRO=debian/eol:buster FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again ARG UID diff --git a/jenkins-common.sh b/jenkins-common.sh index 36dd831..31ad497 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -56,13 +56,13 @@ osmo-*-centos8) echo "almalinux:8"; ;; centos7-*) echo "centos:centos7" ;; centos8-*) echo "almalinux:8" ;; - osmo-*-debian10) echo "debian:buster" ;; - debian9-*) echo "debian:stretch" ;; - debian10-*) echo "debian:buster" ;; + osmo-*-debian10) echo "debian/eol:buster" ;; + debian9-*) echo "debian/eol:stretch" ;; + debian10-*) echo "debian/eol:buster" ;; debian11-*) echo "debian:bullseye" ;; debian12-*) echo "debian:bookworm" ;; - debian-stretch-*) echo "debian:stretch" ;; - debian-buster-*) echo "debian:buster" ;; + debian-stretch-*) echo "debian/eol:stretch" ;; + debian-buster-*) echo "debian/eol:buster" ;; debian-bullseye-*) echo "debian:bullseye" ;; debian-bookworm-*) echo "debian:bookworm" ;; *) echo "debian:$DEBIAN_DEFAULT" ;; -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40660?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: Ic960320dcc6c5e8d8cc4d0bdf7541da4b692e10e Gerrit-Change-Number: 40660 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/registry…: debian:buster -> debian/eol:buster
by osmith 14 Jul '25

14 Jul '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40658?usp=email ) Change subject: jobs/registry…: debian:buster -> debian/eol:buster ...................................................................... jobs/registry…: debian:buster -> debian/eol:buster Related: OS#6811 Change-Id: I6a9fdec0fa1063859e10cf5978cf6fd6b53619c1 --- M jobs/registry-update-base-images.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/40658/1 diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index d838f91..1b5ad97 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -26,7 +26,7 @@ - shell: | REGISTRY="registry.osmocom.org" IMAGES=" - debian:buster + debian/eol:buster debian:bullseye debian:bookworm debian:sid -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6a9fdec0fa1063859e10cf5978cf6fd6b53619c1 Gerrit-Change-Number: 40658 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/registry…: add email parameter
by osmith 14 Jul '25

14 Jul '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40657?usp=email ) Change subject: jobs/registry…: add email parameter ...................................................................... jobs/registry…: add email parameter Change-Id: Ie1e258b77ddb988e27b778cb8243cf33bb5f5440 --- M jobs/registry-update-base-images.yml 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/57/40657/1 diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index b51ae95..d838f91 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -16,6 +16,11 @@ - build-discarder: days-to-keep: 30 num-to-keep: 30 + parameters: + - string: + name: EMAIL_NOTIFICATIONS + description: For failed build notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' node: osmocom-master builders: - shell: | @@ -43,6 +48,6 @@ publishers: - email: notify-every-unstable-build: true - recipients: 'jenkins-notifications(a)lists.osmocom.org' + recipients: '$EMAIL_NOTIFICATIONS' # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie1e258b77ddb988e27b778cb8243cf33bb5f5440 Gerrit-Change-Number: 40657 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/registry…: fix syntax error
by osmith 14 Jul '25

14 Jul '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40659?usp=email ) Change subject: jobs/registry…: fix syntax error ...................................................................... jobs/registry…: fix syntax error Use $REGISTRY instead of ${REGISTRY}, so jenkins-job-builder 6.3.0 doesn't interpret it as JJB variable. It needs to be interpreted as shell variable here. This probably worked with older JJB versions. /home/user/code/osmo-dev/src/osmo-ci/jobs/registry-update-base-images.yml:27:11: While formatting string 'REGISTRY="registry.osmocom.org"\nIMAGES="\n debian/eol:buster\n debian:bullseye\n ...': Missing parameter: 'REGISTRY' REGISTRY="registry.osmocom.org" ^ Change-Id: I54b11d0dd7847bd208c4e4270be3151479dac983 --- M jobs/registry-update-base-images.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/59/40659/1 diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index 1b5ad97..c9934cb 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -35,7 +35,7 @@ " for i in $IMAGES; do src=$i - dst=${REGISTRY}/$i + dst=$REGISTRY/$i echo echo ======= $src docker pull $src -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40659?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I54b11d0dd7847bd208c4e4270be3151479dac983 Gerrit-Change-Number: 40659 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: repo-install-test: debian10: use archive mirror
by osmith 14 Jul '25

14 Jul '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40656?usp=email ) Change subject: repo-install-test: debian10: use archive mirror ...................................................................... repo-install-test: debian10: use archive mirror Related: OS#6811 Change-Id: I5c6d6624c083e103927942f62e76fbb7b87127a8 --- M scripts/repo-install-test.sh 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index 9345876..27bb450 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -143,6 +143,13 @@ # https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/ qemu_ssh dnf upgrade -y almalinux-release ;; + debian10) + qemu_ssh sed \ + -i \ + -e s/deb.debian.org/archive.debian.org/g \ + -e s/security.debian.org/archive.debian.org/g \ + /etc/apt/sources.list + ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5c6d6624c083e103927942f62e76fbb7b87127a8 Gerrit-Change-Number: 40656 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: OBS: use debian/eol:buster for debian:10
by osmith 14 Jul '25

14 Jul '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40654?usp=email ) Change subject: OBS: use debian/eol:buster for debian:10 ...................................................................... OBS: use debian/eol:buster for debian:10 Related: OS#6811 Change-Id: I5dabb97e259bd1d84cf6e9f8a46dc17240b5b88d --- M scripts/obs/lib/docker.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/obs/lib/docker.py b/scripts/obs/lib/docker.py index 779099b..a68c7f9 100644 --- a/scripts/obs/lib/docker.py +++ b/scripts/obs/lib/docker.py @@ -19,6 +19,9 @@ if image_type.endswith("_manuals"): return get_image_name(distro, image_type.replace("_manuals", "")) + if distro == "debian:10": + distro = "debian/eol:buster" + return distro -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5dabb97e259bd1d84cf6e9f8a46dc17240b5b88d Gerrit-Change-Number: 40654 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0