osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38769?usp=email )
Change subject: jenkins-common: add NO_DOCKER_IMAGE_PULL
......................................................................
jenkins-common: add NO_DOCKER_IMAGE_PULL
The docker_images_require function runs "docker build" with the "--pull"
argument to automatically get new base images (typically debian
bookworm).
Recently this started to cause an error when building the arm32/v7
image debian-bookworm-build-arm on the now arm64/v8 (aarch64) rpi4.
Add NO_DOCKER_IMAGE_PULL to be able to omit "--pull". The related patch
adjusts osmo-ci to pull separately beforehand.
Related: OS#6627
Related: osmo-ci Ibf91bc098f34b43f46680d0395928e60cdd478fc
Change-Id: I6e0a84ce7f8357611abc5da856f36d0df247de75
---
M README.md
M jenkins-common.sh
2 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/38769/1
diff --git a/README.md b/README.md
index 3139f07..314c91e 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@
Osmocom project. Defaults to `master`.
* `NO_DOCKER_IMAGE_BUILD`: when set to `1`, it won't try to update the
containers (see "caching" below)
+* `NO_DOCKER_IMAGE_PULL`: when running `docker build`, don't add `--pull`
* `DOCKER_ARGS`: pass extra arguments to docker, e.g. to mount local sources
for building as done in osmo-dev.git/ttcn3/ttcn3.sh
* `TEST_CONFIGS`: for tests that can run with multiple config sets (e.g.
diff --git a/jenkins-common.sh b/jenkins-common.sh
index af52b7f..acdf262 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -203,10 +203,12 @@
dir="$(docker_dir_from_image_name "$i")"
# Pull upstream base images
- pull_arg="--pull"
- from_line="$(grep '^FROM' ${IMAGE_DIR_PREFIX}/${dir}/Dockerfile)"
- if echo "$from_line" | grep -q '$USER'; then
- pull_arg=""
+ if [ -z "$NO_DOCKER_IMAGE_PULL" ]; then
+ pull_arg="--pull"
+ from_line="$(grep '^FROM' ${IMAGE_DIR_PREFIX}/${dir}/Dockerfile)"
+ if echo "$from_line" | grep -q '$USER'; then
+ pull_arg=""
+ fi
fi
set +x
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38769?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: I6e0a84ce7f8357611abc5da856f36d0df247de75
Gerrit-Change-Number: 38769
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38768?usp=email )
Change subject: scripts/osmo-ci-docker-rebuild: fix rpi4 failures
......................................................................
scripts/osmo-ci-docker-rebuild: fix rpi4 failures
It is no longer possible to pull the arm32 image by just using "docker
build --pull". Use a separate pull command with --platform and set an
env var to not use --pull with "docker build".
Related: OS#6627
Related: docker-playground I6e0a84ce7f8357611abc5da856f36d0df247de75
Change-Id: Ibf91bc098f34b43f46680d0395928e60cdd478fc
---
M scripts/osmo-ci-docker-rebuild.sh
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/38768/1
diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh
index 78bf21c..1cc1165 100755
--- a/scripts/osmo-ci-docker-rebuild.sh
+++ b/scripts/osmo-ci-docker-rebuild.sh
@@ -10,6 +10,10 @@
"debian-bookworm-erlang"
;;
arm*|aarch64)
+ # OS#6627: need to run a separate "docker pull" command with platform
+ docker pull docker.io/arm32v7/debian:bookworm --platform="linux/arm/v7"
+
+ export NO_DOCKER_IMAGE_PULL=1
docker_images_require \
"debian-bookworm-build-arm"
;;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38768?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: Ibf91bc098f34b43f46680d0395928e60cdd478fc
Gerrit-Change-Number: 38768
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38759?usp=email )
Change subject: Use new libosmo-sigtran API osmo_ss7_as_get_asp_protocol()
......................................................................
Patch Set 2: Verified+1
(1 comment)
Patchset:
PS2:
CI is expected to fail until the end of this patchset where it passes
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38759?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.12.2
Gerrit-Change-Id: I58b9713ae247a7e28c004170dd890a78c03c39c0
Gerrit-Change-Number: 38759
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 14 Nov 2024 09:00:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: osmith.
osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38759?usp=email )
Change subject: Use new libosmo-sigtran API osmo_ss7_as_get_asp_protocol()
......................................................................
Removed Verified-1 by Jenkins Builder (1000002)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38759?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: deleteVote
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.12.2
Gerrit-Change-Id: I58b9713ae247a7e28c004170dd890a78c03c39c0
Gerrit-Change-Number: 38759
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38758?usp=email )
Change subject: bsc_sccplite_msc_send(): Fix msgb leak
......................................................................
Patch Set 2: Verified+1
(1 comment)
Patchset:
PS2:
CI is expected to fail until the end of this patchset where it passes
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38758?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.12.2
Gerrit-Change-Id: I08839ae297fa4ec2ffc9ecceb1bad345bf76da10
Gerrit-Change-Number: 38758
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 14 Nov 2024 09:00:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38757?usp=email )
Change subject: Use new libosmo-sigtran API osmo_ss7_instances_llist_entry()
......................................................................
Patch Set 2: Verified+1
(1 comment)
Patchset:
PS2:
CI is expected to fail until the end of this patchset where it passes
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38757?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.12.2
Gerrit-Change-Id: Iacbe2944957ab2e2a627f2dabdaa66d9fc8eabe3
Gerrit-Change-Number: 38757
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 14 Nov 2024 09:00:06 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: osmith.
osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38757?usp=email )
Change subject: Use new libosmo-sigtran API osmo_ss7_instances_llist_entry()
......................................................................
Removed Verified-1 by Jenkins Builder (1000002)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38757?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: deleteVote
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.12.2
Gerrit-Change-Id: Iacbe2944957ab2e2a627f2dabdaa66d9fc8eabe3
Gerrit-Change-Number: 38757
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38756?usp=email )
Change subject: Use new libosmo-sigtran API osmo_ss7_instance_get_id()
......................................................................
Patch Set 2: Verified+1
(1 comment)
Patchset:
PS2:
CI is expected to fail until the end of this patchset where it passes
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38756?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.12.2
Gerrit-Change-Id: Ic0a468de0e8852ddd1ebd99f25a6400475af9a1f
Gerrit-Change-Number: 38756
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 14 Nov 2024 08:59:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: osmith.
osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38756?usp=email )
Change subject: Use new libosmo-sigtran API osmo_ss7_instance_get_id()
......................................................................
Removed Verified-1 by Jenkins Builder (1000002)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38756?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: deleteVote
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.12.2
Gerrit-Change-Id: Ic0a468de0e8852ddd1ebd99f25a6400475af9a1f
Gerrit-Change-Number: 38756
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>