osmith has submitted this change. ( 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(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
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: merged
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>
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>
osmith has submitted this change. ( 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(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
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: merged
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>
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>
Attention is currently required from: fixeria.
pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38767?usp=email )
Change subject: s1ap_proxy: properly handle E-RAB RELEASE IND
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File src/s1ap_proxy.erl:
https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38767/comment/951e2b1c_921d… :
PS1, Line 447: handle_ies(Content, ?'id-E-RABItem', S#proxy_state{rel_kind = cmd});
it probably makes more sense to set this wherever we parse the message type "RELEASE COMMAND"? or there's no such place?
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38767?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: Id1b77ef59818d6416326477a25e9866ab636b3ad
Gerrit-Change-Number: 38767
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 14 Nov 2024 11:30:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria.
pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38766?usp=email )
Change subject: erab_fsm: add erab_release/2 and erab_release_ind/1
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38766?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: Icc9c0f6a1aef327e9585942b3c9d2302feda393a
Gerrit-Change-Number: 38766
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 14 Nov 2024 11:28:27 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria.
pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38765?usp=email )
Change subject: erab_fsm: rename erab_release_req/1 -> erab_release_cmd/1
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File src/erab_fsm.erl:
https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38765/comment/12b2722c_6888… :
PS1, Line 291: ?LOG_DEBUG("Rx E-RAB RELEASE Req"),
you need to fix this line too then.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38765?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: I2f19d2c9bad52b89327f68f7dc6a2f6347a00ba0
Gerrit-Change-Number: 38765
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 14 Nov 2024 11:24:32 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes