October 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmocom-bb[master]: Correctly detect the follow-on proceed information element
by fixeria 10 Oct '23

10 Oct '23

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34704?usp=email ) Change subject: Correctly detect the follow-on proceed information element ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34704?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2b1aceb8b85bdd9faabe354501f9036f1fc6fe33 Gerrit-Change-Number: 34704 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 12:35:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: Correctly detect the follow-on proceed information element
by fixeria 10 Oct '23

10 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34704?usp=email ) Change subject: Correctly detect the follow-on proceed information element ...................................................................... Correctly detect the follow-on proceed information element Even if follow-on proceed is not supported, the warning message about not beeing supported should only show when the follow-on proceed information element is included in the location update accept messages. Change-Id: I2b1aceb8b85bdd9faabe354501f9036f1fc6fe33 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/04/34704/1 diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 810dfa7..bcd2c64 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -2710,7 +2710,7 @@ gsm322_plmn_sendmsg(ms, nmsg); /* follow on proceed */ - if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) + if (TLVP_PRESENT(&tp, GSM48_IE_FOLLOW_ON_PROC)) LOGP(DMM, LOGL_NOTICE, "follow-on proceed not supported.\n"); /* start RR release timer */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34704?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2b1aceb8b85bdd9faabe354501f9036f1fc6fe33 Gerrit-Change-Number: 34704 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: Provide create_conn_and_push_mm_hdr() with correct SAPI
by fixeria 10 Oct '23

10 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34705?usp=email ) Change subject: Provide create_conn_and_push_mm_hdr() with correct SAPI ...................................................................... Provide create_conn_and_push_mm_hdr() with correct SAPI Change-Id: I454178f45aed49417f8cd7744155be66b9ac509f Fixes: 00507bdc "Cleaning gsm48_mm_data_ind()" Related: OS#6216 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/34705/1 diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index bcd2c64..995c5d1 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -4632,10 +4632,9 @@ #define MMDATASLLEN \ (sizeof(mmdatastatelist) / sizeof(struct mmdatastate)) -static int create_conn_and_push_mm_hdr(struct gsm48_mmlayer *mm, struct msgb *msg, int rr_est, int rr_prim) +static int create_conn_and_push_mm_hdr(struct gsm48_mmlayer *mm, struct msgb *msg, int rr_est, int rr_prim, + uint8_t sapi) { - struct gsm48_rr_hdr *rrh = (struct gsm48_rr_hdr *)msg->data; - uint8_t sapi = rrh->sapi; struct gsm48_hdr *gh = msgb_l3(msg); uint8_t pdisc = gh->proto_discr & 0x0f; uint8_t transaction_id; @@ -4694,6 +4693,8 @@ static int gsm48_mm_data_ind(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm48_rr_hdr *rrh = (struct gsm48_rr_hdr *)msg->data; + uint8_t sapi = rrh->sapi; struct gsm48_hdr *gh = msgb_l3(msg); uint8_t pdisc = gh->proto_discr & 0x0f; uint8_t msg_type = gh->msg_type & 0xbf; @@ -4729,34 +4730,34 @@ break; /* follow the selection procedure below */ case GSM48_PDISC_CC: - rc = create_conn_and_push_mm_hdr(mm, msg, GSM48_MMCC_EST_IND, GSM48_MMCC_DATA_IND); + rc = create_conn_and_push_mm_hdr(mm, msg, GSM48_MMCC_EST_IND, GSM48_MMCC_DATA_IND, sapi); if (rc == 0) rc = gsm48_rcv_cc(ms, msg); msgb_free(msg); return rc; case GSM48_PDISC_NC_SS: - rc = create_conn_and_push_mm_hdr(mm, msg, GSM48_MMSS_EST_IND, GSM48_MMSS_DATA_IND); + rc = create_conn_and_push_mm_hdr(mm, msg, GSM48_MMSS_EST_IND, GSM48_MMSS_DATA_IND, sapi); if (rc == 0) rc = gsm480_rcv_ss(ms, msg); msgb_free(msg); return rc; case GSM48_PDISC_SMS: - rc = create_conn_and_push_mm_hdr(mm, msg, GSM48_MMSMS_EST_IND, GSM48_MMSMS_DATA_IND); + rc = create_conn_and_push_mm_hdr(mm, msg, GSM48_MMSMS_EST_IND, GSM48_MMSMS_DATA_IND, sapi); if (rc == 0) rc = gsm411_rcv_sms(ms, msg); msgb_free(msg); return rc; case GSM48_PDISC_GROUP_CC: - rc = create_conn_and_push_mm_hdr(mm, msg, -1, GSM48_MMGCC_DATA_IND); + rc = create_conn_and_push_mm_hdr(mm, msg, -1, GSM48_MMGCC_DATA_IND, sapi); if (rc == 0) rc = gsm44068_rcv_gcc_bcc(ms, msg); msgb_free(msg); return rc; case GSM48_PDISC_BCAST_CC: - rc = create_conn_and_push_mm_hdr(mm, msg, -1, GSM48_MMBCC_DATA_IND); + rc = create_conn_and_push_mm_hdr(mm, msg, -1, GSM48_MMBCC_DATA_IND, sapi); if (rc == 0) rc = gsm44068_rcv_gcc_bcc(ms, msg); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34705?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I454178f45aed49417f8cd7744155be66b9ac509f Gerrit-Change-Number: 34705 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: Fix selection of correct ARFCN at arfcn_from_freq_index()
by fixeria 10 Oct '23

10 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34657?usp=email ) Change subject: Fix selection of correct ARFCN at arfcn_from_freq_index() ...................................................................... Fix selection of correct ARFCN at arfcn_from_freq_index() The selection of ARFCN is described in TS 44.018 §10.5.2.20. The frequencies found in SI5 and SI5bis are counted first, in the following order: ARFCN 1..1023,0. The frequencies found in SI5ter are counted afterwards, in the following order: ARFCN 1..1023,0. Related: OS#5782 Change-Id: I090d84a5550d89743e8f5a886f400df6483f50d7 --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 28 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/common/sysinfo.c b/src/host/layer23/src/common/sysinfo.c index 356f8eb..f541c85 100644 --- a/src/host/layer23/src/common/sysinfo.c +++ b/src/host/layer23/src/common/sysinfo.c @@ -1078,30 +1078,25 @@ return 0; } -static int16_t arfcn_from_freq_index(struct gsm48_sysinfo *s, uint16_t index) +/* Get ARFCN from BCCH allocation found in SI5/SI5bis an SI5ter. See TS 44.018 §10.5.2.20. */ +int16_t arfcn_from_freq_index(const struct gsm48_sysinfo *s, uint16_t index) { uint16_t arfcn, i = 0; - /* First, search for the P-GSM ARFCN. */ - for (arfcn = 1; arfcn < 124; arfcn++) { - if (!(s->freq[arfcn].mask & FREQ_TYPE_REP)) + /* Search for ARFCN found in SI5 or SI5bis. (first sub list) */ + for (arfcn = 1; arfcn <= 1024; arfcn++) { + if (!(s->freq[arfcn & 1023].mask & (FREQ_TYPE_REP_5 | FREQ_TYPE_REP_5bis))) continue; if (index == i++) - return arfcn; + return arfcn & 1023; } - /* Second, search for ARFCN 0. */ - if ((s->freq[arfcn].mask & FREQ_TYPE_REP)) { - if (index == i++) - return arfcn; - } - - /* Third, search for all other ARFCN. */ - for (arfcn = 125; arfcn < 1024; arfcn++) { - if (!(s->freq[arfcn].mask & FREQ_TYPE_REP)) + /* Search for ARFCN found in SI5ter. (second sub list) */ + for (arfcn = 1; arfcn <= 1024; arfcn++) { + if (!(s->freq[arfcn & 1023].mask & FREQ_TYPE_REP_5ter)) continue; if (index == i++) - return arfcn; + return arfcn & 1023; } /* If not found, return EOF (-1) as idicator. */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I090d84a5550d89743e8f5a886f400df6483f50d7 Gerrit-Change-Number: 34657 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: Fix indices of ARFCNs for measurement report
by fixeria 10 Oct '23

10 Oct '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email ) Change subject: Fix indices of ARFCNs for measurement report ...................................................................... Fix indices of ARFCNs for measurement report The order of ARFCNs are described in TS 44.018 §10.5.2.20. The function arfcn_from_freq_index() is re-used to get the ARFCNs in correct order for the report. Change-Id: I0674467eb5a38a341cf65f95a25aa5f7232df069 --- M src/host/layer23/include/osmocom/bb/common/sysinfo.h M src/host/layer23/src/mobile/gsm48_rr.c 2 files changed, 32 insertions(+), 19 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/sysinfo.h b/src/host/layer23/include/osmocom/bb/common/sysinfo.h index 89d38ac..9efb248 100644 --- a/src/host/layer23/include/osmocom/bb/common/sysinfo.h +++ b/src/host/layer23/include/osmocom/bb/common/sysinfo.h @@ -219,5 +219,6 @@ int gsm48_decode_mobile_alloc(struct gsm_sysinfo_freq *freq, const uint8_t *ma, uint8_t len, uint16_t *hopping, uint8_t *hopp_len, int si4); +int16_t arfcn_from_freq_index(const struct gsm48_sysinfo *s, uint16_t index); #endif /* _SYSINFO_H */ diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 8dca379..3200412 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -2538,32 +2538,30 @@ && s->si5 && (!s->nb_ext_ind_si5 || s->si5bis)) { struct gsm48_rr_meas *rrmeas = &ms->rrlayer.meas; - int n = 0, i, refer_pcs; + int i, refer_pcs; + int16_t arfcn; LOGP(DRR, LOGL_NOTICE, "Complete set of SI5* for BA(%d)\n", s->nb_ba_ind_si5); rrmeas->nc_num = 0; refer_pcs = gsm_refer_pcs(cs->arfcn, s); - /* collect channels from freq list (1..1023,0) */ - for (i = 1; i <= 1024; i++) { - if ((s->freq[i & 1023].mask & FREQ_TYPE_REP)) { - if (n == 32) { - LOGP(DRR, LOGL_NOTICE, "SI5* report " - "exceeds 32 BCCHs\n"); - break; - } - if (refer_pcs && i >= 512 && i <= 810) - rrmeas->nc_arfcn[n] = i | ARFCN_PCS; - else - rrmeas->nc_arfcn[n] = i & 1023; - rrmeas->nc_rxlev_dbm[n] = -128; - LOGP(DRR, LOGL_NOTICE, "SI5* report arfcn %s\n", - gsm_print_arfcn(rrmeas->nc_arfcn[n])); - n++; - } + /* Collect channels from freq list in correct order. */ + for (i = 1; i < 32; i++) { + arfcn = arfcn_from_freq_index(s, i); + if (arfcn < 0) + break; + if (refer_pcs && arfcn >= 512 && arfcn <= 810) + rrmeas->nc_arfcn[i] = arfcn | ARFCN_PCS; + else + rrmeas->nc_arfcn[i] = arfcn; + rrmeas->nc_rxlev_dbm[i] = -128; + LOGP(DRR, LOGL_NOTICE, "SI5/SI5bis report arfcn %s (index %d)\n", + gsm_print_arfcn(rrmeas->nc_arfcn[i]), i); } - rrmeas->nc_num = n; + rrmeas->nc_num = i; + if (i == 32 && arfcn_from_freq_index(s, i) >= 0) + LOGP(DRR, LOGL_NOTICE, "SI5/SI5bis/SI5ter define more than 32 channels.\n"); } /* send sysinfo event to other layers */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0674467eb5a38a341cf65f95a25aa5f7232df069 Gerrit-Change-Number: 34658 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-pcu-test: use PFUIF v10 for 2023q1
by osmith 10 Oct '23

10 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34698?usp=email ) Change subject: ttcn3-pcu-test: use PFUIF v10 for 2023q1 ...................................................................... ttcn3-pcu-test: use PFUIF v10 for 2023q1 Change-Id: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 --- M jenkins-common.sh M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-pcu-test/sns/PCU_Tests.cfg 5 files changed, 34 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jenkins-common.sh b/jenkins-common.sh index e72a28d..c9299df 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -503,6 +503,14 @@ esac } +# Check if IMAGE_SUFFIX starts with "2023q1" (e.g. "2023q1-centos8") +image_suffix_is_2023q1() { + case "$IMAGE_SUFFIX" in + 2023q1*) return 0 ;; + *) return 1 ;; + esac +} + # Write the Osmocom repository to the TTCN3 config file, so the tests may take # different code paths (OS#5327) # $1: path to TTCN3 config file (e.g. BSC_Tests.cfg) diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 40b8e2c..b3f3b8f 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -34,7 +34,8 @@ } } } -Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; +Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU" +PCUIF_Types.mp_pcuif_version := 11 [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 393e828..50027d3 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -9,10 +9,17 @@ set_clean_up_trap set -e +set_pcuif_version() { + if image_suffix_is_2023q1; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1 + fi +} + mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp sns/PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index ee53bb7..0a1eb67 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -9,10 +9,17 @@ set_clean_up_trap set -e +set_pcuif_version() { + if image_suffix_is_2023q1; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1 + fi +} + mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg index 1036f5a..d62f52d 100644 --- a/ttcn3-pcu-test/sns/PCU_Tests.cfg +++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg @@ -59,6 +59,7 @@ } } } +PCUIF_Types.mp_pcuif_version := 11 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 Gerrit-Change-Number: 34698 Gerrit-PatchSet: 3 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> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-pcu-test: use PFUIF v10 for 2023q1
by pespin 10 Oct '23

10 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34698?usp=email ) Change subject: ttcn3-pcu-test: use PFUIF v10 for 2023q1 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34698?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 Gerrit-Change-Number: 34698 Gerrit-PatchSet: 2 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: Tue, 10 Oct 2023 12:18:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: debian-bookworm-titan: add ccache
by osmith 10 Oct '23

10 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34703?usp=email ) Change subject: debian-bookworm-titan: add ccache ...................................................................... debian-bookworm-titan: add ccache Add ccache, so it can be used when rebuilding the testsuite from source from a development branch. Ccache is not used by default. Related: osmo-dev I800062d0379295a6905851db29e820ff16217653 Change-Id: I94d22b8da9f897974c5913b2a8138c653c215446 --- M debian-bookworm-titan/Dockerfile 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/34703/1 diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile index 99a79c8..b0cfaba 100644 --- a/debian-bookworm-titan/Dockerfile +++ b/debian-bookworm-titan/Dockerfile @@ -19,6 +19,7 @@ apt-get install -y --no-install-recommends \ build-essential \ ca-certificates \ + ccache \ git \ iputils-ping \ netcat-openbsd \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I94d22b8da9f897974c5913b2a8138c653c215446 Gerrit-Change-Number: 34703 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: ttcn3.sh: add clean argument
by osmith 10 Oct '23

10 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/34700?usp=email ) Change subject: ttcn3.sh: add clean argument ...................................................................... ttcn3.sh: add clean argument Change-Id: If779b87c02d01b877e44118db34bdf2c83dbf619 --- M ttcn3/ttcn3.sh 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/00/34700/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 3563062..68dec64 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -14,12 +14,29 @@ DOCKER_IMG_BUILD="debian-bookworm-build" DOCKER_IMG_TITAN="debian-bookworm-titan" +clean() { + if [ "$1" != "clean" ]; then + return + fi + if [ "$#" != 1 ]; then + parse_args -h + fi + + set -x + rm -rf \ + "$DIR_MAKE" \ + "$DIR_OUTPUT" \ + "$DIR_USR_LOCAL" + exit 0 +} + parse_args() { while getopts 'h' OPTION; do case "$OPTION" in h|*) local name="$(basename $0)" echo "usage: $name [-h] PROJECT" + echo " or: $name clean" echo "arguments:" echo " -h show help" echo " PROJECT the testsuite project to run" @@ -380,6 +397,7 @@ echo "---" } +clean "$@" parse_args "$@" check_usage check_ttcn3_install -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34700?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If779b87c02d01b877e44118db34bdf2c83dbf619 Gerrit-Change-Number: 34700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-dev[master]: ttcn3.sh: add getopts
by osmith 10 Oct '23

10 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/34699?usp=email ) Change subject: ttcn3.sh: add getopts ...................................................................... ttcn3.sh: add getopts Add getopts parsing. The idea was to add support for setting a different IMAGE_SUFFIX argument, but later on it became clear it is not worth implementing here. Add the getopts logic anyway because it can be used to add other arguments in the future. Change-Id: If55a982d92b2a24a175ab7f3a8f048f054033dc2 --- M ttcn3/ttcn3.sh 1 file changed, 45 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/99/34699/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 74e87cc..3563062 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -PROJECT="$1" -PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')" +PROJECT="" +PROJECT_UPPER="" DIR_OSMODEV="$(readlink -f "$(dirname $0)/..")" DIR_MAKE="${DIR_MAKE:-${DIR_OSMODEV}/ttcn3/make}" DIR_OUTPUT="${DIR_OUTPUT:-${DIR_OSMODEV}/ttcn3/out}" @@ -14,15 +14,36 @@ DOCKER_IMG_BUILD="debian-bookworm-build" DOCKER_IMG_TITAN="debian-bookworm-titan" +parse_args() { + while getopts 'h' OPTION; do + case "$OPTION" in + h|*) + local name="$(basename $0)" + echo "usage: $name [-h] PROJECT" + echo "arguments:" + echo " -h show help" + echo " PROJECT the testsuite project to run" + echo "examples:" + echo " $name bsc" + echo " $name bsc-sccplite" + echo " $name hlr" + exit 1 + ;; + esac + done + shift "$(($OPTIND - 1))" + + if [ "$#" != "1" ]; then + parse_args -h + fi + + PROJECT="$1" + PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')" +} + check_usage() { - local name="$(basename $0)" if [ -z "$PROJECT" ]; then - echo "usage: $name PROJECT" - echo "examples:" - echo " * $name bsc" - echo " * $name bsc-sccplite" - echo " * $name hlr" - exit 1 + parse_args -h fi } @@ -359,6 +380,7 @@ echo "---" } +parse_args "$@" check_usage check_ttcn3_install setup_dir_make -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34699?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If55a982d92b2a24a175ab7f3a8f048f054033dc2 Gerrit-Change-Number: 34699 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0