Attention is currently required from: fixeria, jolly.
Hello Jenkins Builder, fixeria, jolly,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/42649?usp=email
to look at the new patch set (#2).
Change subject: jobs/gerrit: fix artifacts logic
......................................................................
jobs/gerrit: fix artifacts logic
The previous logic failed when there are no artifacts for archiving,
for multiple reasons. Fix all of them:
* "allow-empty" needs to be set, so jenkins doesn't fail the job when it
can't find any artifacts to archive.
* The "artifacts" string must not be empty even if "allow-empty" is set,
as otherwise it assumes a configuration error.
* The jenkins jobs fails in the archiving step if the workspace dir
doesn't exist.
Fixes: 4c392b9e ("jobs/gerrit: archive osmo-ccid-firmware artifacts")
Change-Id: If7a051d7be2beb617c2eda4fd1a669565c2c5b55
---
M jobs/gerrit-verifications.yml
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/42649/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42649?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If7a051d7be2beb617c2eda4fd1a669565c2c5b55
Gerrit-Change-Number: 42649
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/42649?usp=email )
Change subject: jobs/gerrit: fix artifacts logic
......................................................................
jobs/gerrit: fix artifacts logic
The previous logic failed when there are not artifacts for archiving,
for multiple reasons. Fix all of them:
* "allow-empty" needs to be set, so jenkins doesn't fail the job when it
can't find any artifacts to archive.
* The "artifacts" string must not be empty even if "allow-empty" is set,
as otherwise it assumes a configuration error.
* The jenkins jobs fails in the archiving step if the workspace dir
doesn't exist.
Fixes: 4c392b9e ("jobs/gerrit: archive osmo-ccid-firmware artifacts")
Change-Id: If7a051d7be2beb617c2eda4fd1a669565c2c5b55
---
M jobs/gerrit-verifications.yml
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/42649/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index faae9b9..1177a51 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -113,7 +113,10 @@
# Range from oldest supported Debian version to newest, see:
# https://gerrit.osmocom.org/c/osmo-ci/+/40861/comment/d35a8783_2a3833a4/
pipeline_binpkgs: "debian:11 debian:13"
- artifacts: ""
+ # When using an empty string, archiving fails even if allow-empty is set:
+ # "ERROR: Step ‘Archive the artifacts’ failed: No artifacts are configured
+ # for archiving."
+ artifacts: "nothing"
# in alphabetical order
repos:
@@ -856,14 +859,18 @@
builders:
- shell: '{obj:cmd}'
- # Remove workspace on success to free up space
+ # Replace workspace with empty dir to free up space. Having an empty dir
+ # is required so the artifacts logic doesn't fail (even if there is
+ # nothing to archive).
- shell: |
- if [ -z "{artifacts}" ]; then
+ if [ "{artifacts}" = "nothing" ]; then
rm -rf "$WORKSPACE"
+ mkdir "$WORKSPACE"
fi
publishers:
- archive:
+ allow-empty: true
artifacts: '{obj:artifacts}'
- warnings:
console-log-parsers:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42649?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: If7a051d7be2beb617c2eda4fd1a669565c2c5b55
Gerrit-Change-Number: 42649
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/42648?usp=email )
Change subject: jobs/gerrit-verifications: fix hwtest param
......................................................................
jobs/gerrit-verifications: fix hwtest param
This must be a bool instead of a string. Without this patch, the
condition checking for the bool is always true.
Fixes: 986c2648 ("jobs/gerrit: run osmo-ccid-firmware-hwtest")
Change-Id: I3117ddab888dd226ed57b62b9b9e672f1cb9127d
---
M jobs/gerrit-verifications.yml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/48/42648/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 09c465b..faae9b9 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -591,7 +591,7 @@
name: PIPELINE_BUILD
description: Enable the build job (runs contrib/jenkins.sh)
default: '{obj:pipeline_build}'
- - string:
+ - bool:
name: PIPELINE_HWTEST
description: |
Enable a hardware test job that uses artifacts from the build job.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42648?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: I3117ddab888dd226ed57b62b9b9e672f1cb9127d
Gerrit-Change-Number: 42648
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42646?usp=email )
Change subject: Fix bankd connection at RemsimClient_Tests.TC_bank_disconnect_reconnect
......................................................................
Fix bankd connection at RemsimClient_Tests.TC_bank_disconnect_reconnect
After each connection (initial connection and reconnect), the test must
wait for the bankd connection to be fully established. Previously the
IPA/RSPRO emulation failed, because the socket was closed before sending
the acknowledgemen, leading to a 'Broken pipe' error.
Change-Id: I0a8b339bcc4136442994b8825904df8aaf9aa95d
---
M remsim/RemsimClient_Tests.ttcn
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/42646/1
diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn
index d747eef..5d6db82 100644
--- a/remsim/RemsimClient_Tests.ttcn
+++ b/remsim/RemsimClient_Tests.ttcn
@@ -170,6 +170,7 @@
/* expect inbound connectClientReq on simulated bankd */
as_connectClientReq(i := 1);
+ /* Wait for bankd connection to be established. */
f_sleep(1.0);
/* configure client to disconnect from [simulated] bankd */
@@ -190,6 +191,9 @@
/* expect inbound connect on simulated bankd */
as_connectClientReq(i := 1);
+ /* Wait for bankd connection to be established. */
+ f_sleep(1.0);
+
setverdict(pass);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42646?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0a8b339bcc4136442994b8825904df8aaf9aa95d
Gerrit-Change-Number: 42646
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42647?usp=email )
Change subject: Fix access pcscd in various RemsimBankd_Tests
......................................................................
Fix access pcscd in various RemsimBankd_Tests
Access to pcscd was denied, so that bankd never conneced to the reader.
This caused TC_createMapping_exchangeTPDU to fail, because it requires
connection to virtual smart card for this test
Change-Id: Ibae1c5167daa0157058bc40ce1857c1e6bb9da31
---
M remsim/testenv_bankd.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/42647/1
diff --git a/remsim/testenv_bankd.cfg b/remsim/testenv_bankd.cfg
index b8ebaa7..62df381 100644
--- a/remsim/testenv_bankd.cfg
+++ b/remsim/testenv_bankd.cfg
@@ -5,7 +5,7 @@
[pcscd]
prepare=require_vsmartcard_vpcd.sh
-program=pcscd -f -d
+program=pcscd -f -d --disable-polkit
make=no
package=pcscd
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42647?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibae1c5167daa0157058bc40ce1857c1e6bb9da31
Gerrit-Change-Number: 42647
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/42645?usp=email )
Change subject: Fix: Remove slot mapping at bankd when client disconnects
......................................................................
Fix: Remove slot mapping at bankd when client disconnects
If a client disconnects before removing the slot mapping, the slotmap
entry will not be removed automatically. A subsequent client connection
for the same mapping will then trigger the the error: “ignoring
identical slotmap.”
In a setup with multiple readers, there are multiple bankd worker
threads. If a client re-connects, but if its connection is accepted by
a different thread, subsequent reader access or unmapping will fail.
There will be no mapping at the new thread.
The approach of this fix is to remove the slot mapping, if the client
connection to the worker thread terminates.
Change-Id: I2fd03490e2506c55104309a0ef952389119023b8
---
M src/bankd/bankd_main.c
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/45/42645/1
diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c
index 5e33b41..99a5949 100644
--- a/src/bankd/bankd_main.c
+++ b/src/bankd/bankd_main.c
@@ -1102,6 +1102,16 @@
close(g_worker->client.fd);
memset(&g_worker->client.peer_addr, 0, sizeof(g_worker->client.peer_addr));
g_worker->client.fd = -1;
+ if (g_worker->state >= BW_ST_CONN_CLIENT_MAPPED) {
+ struct slot_mapping *slmap;
+ slmap = slotmap_by_client(g_worker->bankd->slotmaps, &g_worker->client.clslot);
+ if (slmap) {
+ slotmap_del(g_bankd->slotmaps, slmap);
+ g_worker->slot.bank_id = 0xffff;
+ g_worker->slot.slot_nr = 0xffff;
+ worker_set_state(g_worker, BW_ST_CONN_CLIENT_UNMAPPED, true);
+ }
+ }
g_worker->client.clslot.client_id = g_worker->client.clslot.slot_nr = 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/42645?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I2fd03490e2506c55104309a0ef952389119023b8
Gerrit-Change-Number: 42645
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>