osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38227?usp=email )
Change subject: debian-bookworm-titan: chown 1000 for deps
......................................................................
debian-bookworm-titan: chown 1000 for deps
Change the ownership of the "deps" directory to a not yet created user
with the ID 1000. This user gets created when the gerrit verifications
use the container for building. Changing the ownership of the deps
directory allows using them and updating them as needed (e.g. if the
patch in review changes a commit of one of the deps).
Chowning here once results in faster jobs, compared to if we did it
every time the gerrit verifications job ran.
Creating the user here would result in conflicts with other containers
depending on debian-bookworm-titan that may create their own user with
the same UID.
Related: osmo-ci I4bea336097e8180b19b3afa41c0b984d93c21bd1
Change-Id: Id51885d0929f4966b1a4a181b3453c06d7956b53
---
M debian-bookworm-titan/Dockerfile
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/27/38227/1
diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile
index c4af2ef..b4c5f75 100644
--- a/debian-bookworm-titan/Dockerfile
+++ b/debian-bookworm-titan/Dockerfile
@@ -78,4 +78,5 @@
cd /osmo-ttcn3-hacks && \
git pull && \
make -j8 deps; \
- fi
+ fi && \
+ chown -R 1000:1000 /osmo-ttcn3-hacks/deps
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38227?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: Id51885d0929f4966b1a4a181b3453c06d7956b53
Gerrit-Change-Number: 38227
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38219?usp=email )
Change subject: deps/update.sh: split update cmds from Makefile
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38219?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ifab1158000ccb39f0b384bbd81841e417ed24f37
Gerrit-Change-Number: 38219
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 Sep 2024 11:21:46 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38225?usp=email )
Change subject: jobs/gerrit: osmo-ttcn3-hacks: tweak make lines
......................................................................
jobs/gerrit: osmo-ttcn3-hacks: tweak make lines
* The "make clean" is not needed, as the osmo-ttcn3-hacks.git repository
is a fresh clone of code that was submitted to gerrit.
* The "make deps" is not needed, as "make compile" depends on the deps
target.
* Combine the cd and make lines.
* Remove ; at the end of lines, as it is not needed
* Switch " and ', so variables can be used with less escaping in future
patches in this block.
Change-Id: Iac179bfb26478ecab51f47e469b4be7b0f9a5a94
---
M jobs/gerrit-verifications.yml
1 file changed, 4 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/25/38225/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index a21e42a..58752cd 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -442,13 +442,10 @@
-v "$PWD:/build" \
"registry.osmocom.org/osmocom-build/debian-bookworm-titan" \
{timeout_cmd} \
- sh -e -x -c "
- useradd --uid=1000 build;
- cd /build;
- su build -c 'make deps';
- su build -c 'make clean';
- su build -c 'make compile';
- "
+ sh -e -x -c '
+ useradd --uid=1000 build
+ su build -c "make -C /build compile"
+ '
pipeline_binpkgs: ""
- dahdi-tools:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38225?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: Iac179bfb26478ecab51f47e469b4be7b0f9a5a94
Gerrit-Change-Number: 38225
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38226?usp=email )
Change subject: jobs/gerrit: use deps cache from docker image
......................................................................
jobs/gerrit: use deps cache from docker image
Instead of freshly cloning the dependencies each time, use the cache we
already have in the debian-bookworm-titan docker image. This way only
the dependency repositories that were changed in the patch submitted to
gerrit need to be updated.
Related: OS#6572
Change-Id: I895011edf49f612d0df7f4759dc374bab60c32a6
---
M jobs/gerrit-verifications.yml
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/26/38226/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 58752cd..f98eac9 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -444,6 +444,12 @@
{timeout_cmd} \
sh -e -x -c '
useradd --uid=1000 build
+ chown -R build:build /osmo-ttcn3-hacks/deps
+ for i in /osmo-ttcn3-hacks/deps/*/; do
+ if ! [ -e /build/deps/"$(basename "$i")" ]; then
+ ln -s "$i" /build/deps/
+ fi
+ done
su build -c "make -C /build compile"
'
pipeline_binpkgs: ""
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38226?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: I895011edf49f612d0df7f4759dc374bab60c32a6
Gerrit-Change-Number: 38226
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: dexter.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/38224?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: pySim-prog_test: individual ICCIDs for all cards
......................................................................
pySim-prog_test: individual ICCIDs for all cards
Our test cards need to stay recognizable, so it is important that
each card has a unique ICCID. This means we must write an individual
ICCID, when we test writing the ICCID.
Related: OS#4384
Change-Id: I858a35e526e7b4868e901222d587258412779f41
---
M tests/pySim-prog_test/sysmoUSIM-SJS1.data
M tests/pySim-prog_test/sysmoUSIM-SJS1.ok
M tests/pySim-prog_test/sysmosim-gr1.data
M tests/pySim-prog_test/sysmosim-gr1.ok
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/38224/3
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38224?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I858a35e526e7b4868e901222d587258412779f41
Gerrit-Change-Number: 38224
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: dexter.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/38224?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: pySim-prog_test: individual ICCIDs for all cards
......................................................................
pySim-prog_test: individual ICCIDs for all cards
Our test cards need to stay recognizable, so it is important that
each card has a unique ICCID. This means we must write an individual
ICCID, when we test writing the ICCID.
Related: OS#4384
Change-Id: I858a35e526e7b4868e901222d587258412779f41
---
M tests/pySim-prog_test/sysmoUSIM-SJS1.data
M tests/pySim-prog_test/sysmoUSIM-SJS1.ok
M tests/pySim-prog_test/sysmosim-gr1.data
M tests/pySim-prog_test/sysmosim-gr1.ok
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/38224/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38224?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I858a35e526e7b4868e901222d587258412779f41
Gerrit-Change-Number: 38224
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38223?usp=email )
Change subject: pySim-prog_test: do not set an ICCID parameter for sysmoISIM-SJA2
......................................................................
pySim-prog_test: do not set an ICCID parameter for sysmoISIM-SJA2
The sysmoISIM-SJA2 does not support changing of the ICCID.
pySim-prog will also reject this, so let's remove the ICCID
from the parameter list.
Related: OS#4384
Change-Id: I89571f2bf7c4cec4d621c322a58687b7781b0ed2
---
M tests/pySim-prog_test/sysmoISIM-SJA2.data
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/38223/1
diff --git a/tests/pySim-prog_test/sysmoISIM-SJA2.data b/tests/pySim-prog_test/sysmoISIM-SJA2.data
index 748f3ee..9f931cc 100644
--- a/tests/pySim-prog_test/sysmoISIM-SJA2.data
+++ b/tests/pySim-prog_test/sysmoISIM-SJA2.data
@@ -1,6 +1,5 @@
MCC=001
MNC=01
-ICCID=1122334455667788990
KI=AABBCCDDEEFFAABBCCDDEEFFAABBCCDD
OPC=12345678901234567890123456789012
IMSI=001010000000102
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38223?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I89571f2bf7c4cec4d621c322a58687b7781b0ed2
Gerrit-Change-Number: 38223
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>