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

Change in libosmo-abis[master]: Add function to set Sa bits to common part

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31032 ) Change subject: Add function to set Sa bits to common part ...................................................................... Patch Set 1: (1 comment) File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/31032/comment/f3ece0d4_17591acd PS1, Line 178: /* set Sa bits of TS0 */ might be worth adding a spec reference "(Table 5A of G.704)" -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4f5f975f0e5f708ae573a1e1ce41c6a08c207fad Gerrit-Change-Number: 31032 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 23 Jan 2023 10:35:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit: openbsc: set pipeline_binpkgs: false

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31043 ) Change subject: jobs/gerrit: openbsc: set pipeline_binpkgs: false ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Can you provide more context here? we were buildng it but now somehow we decided we don't build it anymore? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3cd810366a6d711c1fdbf3d5ff03d507441307bd Gerrit-Change-Number: 31043 Gerrit-PatchSet: 1 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> Gerrit-Comment-Date: Mon, 23 Jan 2023 10:30:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmo-abis[master]: Add more L1 signals to common part

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31031 ) Change subject: Add more L1 signals to common part ...................................................................... Patch Set 1: (1 comment) File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/31031/comment/64d6fde2_0079e11c PS1, Line 245: S_L_INP_LINE_LOS, : S_L_INP_LINE_NOLOS, : S_L_INP_LINE_AIS, : S_L_INP_LINE_NOAIS, : S_L_INP_LINE_RAI, : S_L_INP_LINE_NORAI, : S_L_INP_LINE_SLIP_RX, : S_L_INP_LINE_SLIP_TX, I understand the above signals, but what does the SA_BITS signal do? when is it supposed to be generated? I think we need some kind of specification how that's supposed to work. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I295dc340d3d3a7cbb5aba5afe807746acbcde33f Gerrit-Change-Number: 31031 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 23 Jan 2023 10:30:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/master,gerrit: use ccache to speed up builds

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31042 ) Change subject: jobs/master,gerrit: use ccache to speed up builds ...................................................................... Patch Set 1: (1 comment) File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/c/osmo-ci/+/31042/comment/a21ee466_32a6b3e3 PS1, Line 675: chmod 777 "$CCACHE_DIR" 777? you went with the shotgun here. Any reason for it? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I81f244ca09e660698df617549d70476fc96255e2 Gerrit-Change-Number: 31042 Gerrit-PatchSet: 1 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> Gerrit-Comment-Date: Mon, 23 Jan 2023 10:29:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers)

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30982 ) Change subject: bsc_ctrl_commands: Add GET for bts neighbor-list (local bts numbers) ...................................................................... Patch Set 3: Code-Review-2 (4 comments) Patchset: PS3: You went the wrong direction by moving that into "neighbor-bts", you need to revert that and go back to version 1. See my inline comments for more info. File src/osmo-bsc/neighbor_ident_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/80b91081_3c39d671 PS3, Line 107: struct osmo_strbuf csv = { .buf = log_buf, what does csv stand for? https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/7f704224_d0bcee85 PS3, Line 109: .pos = log_buf, grepping for "struct osmo_strbuf" in osmocom code shows all users only set .buf and .len, so the others are probably not needed and just cause noise. https://gerrit.osmocom.org/c/osmo-bsc/+/30982/comment/34d3c3c9_8f43eab3 PS3, Line 118: llist_for_each_entry(n, &bts->neighbors, entry) { This is not correct to my understanding. In here you are only adding to the list neihbours which were defined using the "bts_nr" field. We actually want to to add all neighbors of the BTS regardless of how it was defined. For that, you need to lookup each bts based on the n->type, and take bts->nr. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I79aeffd93089086f57c66787fe20b439a4d8b6b4 Gerrit-Change-Number: 30982 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Jan 2023 10:27:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit: openbsc: set pipeline_binpkgs: false

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31043 ) Change subject: jobs/gerrit: openbsc: set pipeline_binpkgs: false ...................................................................... jobs/gerrit: openbsc: set pipeline_binpkgs: false Don't attempt to build deb packages for openbsc in gerrit-verifications. Fix for: ERROR: unknown package: openbsc See packages_osmocom and packages_other in obs/lib/config.py Change-Id: I3cd810366a6d711c1fdbf3d5ff03d507441307bd --- M jobs/gerrit-verifications.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/31043/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index b83b5aa..196eb4f 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -121,6 +121,7 @@ -e SMPP="$SMPP" \ -e MGCP="$MGCP" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh + pipeline_binpkgs: false - openggsn: a1_name: GTP -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3cd810366a6d711c1fdbf3d5ff03d507441307bd Gerrit-Change-Number: 31043 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in libosmo-abis[master]: Use correct bit order of RAW channels at misdn driver

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31035 ) Change subject: Use correct bit order of RAW channels at misdn driver ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-abis/+/31035/comment/9653e615_650718ac PS3, Line 10: chanenls. With this patch, the order is reversed. Now it uses the typo: channels -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I77b899bceacdf5484ea9a841cad55775864b4c82 Gerrit-Change-Number: 31035 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 23 Jan 2023 10:13:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmo-abis[master]: Add setting of Sa bits to misdn driver

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31034 ) Change subject: Add setting of Sa bits to misdn driver ...................................................................... Patch Set 3: (4 comments) Patchset: PS3: I think it makes more sense if you join this commit with the one adding the function pointer in the struct (header file). File src/input/misdn.c: https://gerrit.osmocom.org/c/libosmo-abis/+/31034/comment/1084eeaf_a2841b09 PS3, Line 300: struct e1inp_ts *e1i_ts = &line->ts[16-1]; what's this 16-1? isn't there some descriptivie define for it? https://gerrit.osmocom.org/c/libosmo-abis/+/31034/comment/523d29ce_2b35036c PS3, Line 302: uint8_t buffer[sizeof(struct mISDNhead) + sizeof(int)]; uint32_t? https://gerrit.osmocom.org/c/libosmo-abis/+/31034/comment/7c6b13df_1aa9a140 PS3, Line 304: int *info = (int *)(buffer + sizeof(struct mISDNhead)); uint32_t? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I54205a2534a7638cc071888d853f9d6d312dc9f0 Gerrit-Change-Number: 31034 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 23 Jan 2023 10:13:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/master,gerrit: use ccache to speed up builds

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31042 ) Change subject: jobs/master,gerrit: use ccache to speed up builds ...................................................................... jobs/master,gerrit: use ccache to speed up builds Related: OS#5848 Change-Id: I81f244ca09e660698df617549d70476fc96255e2 --- M jobs/README.adoc M jobs/gerrit-verifications.yml M jobs/master-builds.yml 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/42/31042/1 diff --git a/jobs/README.adoc b/jobs/README.adoc index 2533563..32da7c1 100644 --- a/jobs/README.adoc +++ b/jobs/README.adoc @@ -90,3 +90,15 @@ - hdlc - osmo-gsm-tester - podman + +*ccache* + +The jobs from master-builds and gerrit-verifications use ccache. View the +statistics with SSH on the build nodes with: + + $ CCACHE_DIR=~/ccache/gerrit-verifications ccache -s + $ CCACHE_DIR=~/ccache/master-builds ccache -s + +Note that running multiple jobs in parallel influence the ccache statistics, +and it's impossible to tell which job caused which change in the stats (that's +why they are not printed at the end of each job, it would be confusing). diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 9d1acb9..2eb6f3c 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -51,14 +51,17 @@ docker run --rm=true \ --cap-add SYS_PTRACE \ -e ASCIIDOC_WARNINGS_CHECK="1" \ + -e CCACHE_DIR="/ccache" \ -e HOME=/build \ -e JOB_NAME="$JOB_NAME" \ -e MAKE=make \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \ + -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e WITH_MANUALS="1" \ -w /build -i -u build \ + -v "$HOME/ccache/gerrit-verifications:/ccache" \ -v "$PWD:/build" \ docker_img: '$USER/debian-buster-jenkins' docker_img_erlang: '$USER/debian-bullseye-erlang' @@ -666,6 +669,10 @@ description: set by gerrit-{repos} job builders: + - shell: |- + CCACHE_DIR="$HOME/ccache/gerrit-verifications" + mkdir -p "$CCACHE_DIR" + chmod 777 "$CCACHE_DIR" - shell: '{obj:cmd}' publishers: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 7d1e6da..0ba3779 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -25,17 +25,20 @@ docker run --rm=true \ --cap-add SYS_PTRACE \ -e ASCIIDOC_WARNINGS_CHECK="1" \ + -e CCACHE_DIR="/ccache" \ -e HOME=/build \ -e JOB_NAME="$JOB_NAME" \ -e MAKE=make \ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \ + -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ -e PARALLEL_MAKE="$PARALLEL_MAKE" \ -e PUBLISH="1" \ -e SSH_AUTH_SOCK=/ssh-agent \ -e WITH_MANUALS="1" \ -w /build -i -u build \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ + -v "$HOME/ccache/master-builds:/ccache" \ -v "$PWD:/build" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ docker_img: '$USER/debian-buster-jenkins' @@ -533,6 +536,10 @@ - timed: "H H * * *" builders: + - shell: |- + CCACHE_DIR="$HOME/ccache/master-builds" + mkdir -p "$CCACHE_DIR" + chmod 777 "$CCACHE_DIR" - shell: '{obj:cmd}' publishers: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I81f244ca09e660698df617549d70476fc96255e2 Gerrit-Change-Number: 31042 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: scripts/osmo-build.sh / ARTIFACT_STORE: remove

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31041 ) Change subject: scripts/osmo-build.sh / ARTIFACT_STORE: remove ...................................................................... scripts/osmo-build.sh / ARTIFACT_STORE: remove This script was supposed to cache already built Osmocom libraries. But it was only used with openbsc, didn't work as expected anymore (looking at openbsc-master, it just builds all deps from source without caching) and will be replaced with logic that allows using ccache in a future patch. Using ccache has the big advantage that we can cache all build objects where the source files did not change, and not just do it on a dependency level. Oftentimes only few source files change in our patches, so we can really cache everything else that is not affected within any git repository and not just a dependency that didn't change. ccache also does automatic cache size management to ensure a cache stays within a given size limit. Related: OS#5848 Depends: openbsc Ib3272feec76b30412ca60dec204255b64e33831b Change-Id: Id94d6126b476077d57839e4a884621b8c034f0c6 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml D scripts/osmo-build.sh 3 files changed, 0 insertions(+), 238 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/41/31041/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index b83b5aa..9d1acb9 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -48,11 +48,8 @@ # Documentation for variables (keep in sync!): # https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verificatio… docker_run: | - ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" - mkdir -p "$ARTIFACT_STORE" docker run --rm=true \ --cap-add SYS_PTRACE \ - -e ARTIFACT_STORE=/artifact_store \ -e ASCIIDOC_WARNINGS_CHECK="1" \ -e HOME=/build \ -e JOB_NAME="$JOB_NAME" \ @@ -63,7 +60,6 @@ -e WITH_MANUALS="1" \ -w /build -i -u build \ -v "$PWD:/build" \ - -v "$ARTIFACT_STORE:/artifact_store" \ docker_img: '$USER/debian-buster-jenkins' docker_img_erlang: '$USER/debian-bullseye-erlang' timeout_cmd: '/usr/bin/timeout 30m' diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0f22a77..7d1e6da 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -22,11 +22,8 @@ # Documentation for variables (keep in sync!): # https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verificatio… docker_run: | - ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" - mkdir -p "$ARTIFACT_STORE" docker run --rm=true \ --cap-add SYS_PTRACE \ - -e ARTIFACT_STORE=/artifact_store \ -e ASCIIDOC_WARNINGS_CHECK="1" \ -e HOME=/build \ -e JOB_NAME="$JOB_NAME" \ @@ -40,7 +37,6 @@ -w /build -i -u build \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ -v "$PWD:/build" \ - -v "$ARTIFACT_STORE:/artifact_store" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ docker_img: '$USER/debian-buster-jenkins' timeout_cmd: '/usr/bin/timeout 30m' diff --git a/scripts/osmo-build.sh b/scripts/osmo-build.sh deleted file mode 100644 index 43413cf..0000000 --- a/scripts/osmo-build.sh +++ /dev/null @@ -1,230 +0,0 @@ -#!/bin/sh -# -# This script enables artifacts holding dependencies on a jenkins job level to -# speed up builds. Basically, it holds logic to check whether the necessary artifact -# is available. If so it fetches artifact, unpacks it and if cp/tar succeeded -# it triggers the actual build. -# -# Otherwise it simply builds all dependencies from source by using osmo-build-dep.sh -# and archives deps to the ARTIFACT_STORE afterwards. Revisions of locally built -# dependencies are detrmined after dependencies are built to ensure catching new -# changes in dep_n+1 meanwhile building dep_n. -# -# Furthermore, ARTIFACT_STORE environment variable has to be set on all jenkins slaves. -# The JOB_NAME variable will be injected to each jenkins' job by jenkins itself. -# When using script within a docker container one must inject jenkins' JOB_NAME variable -# to the container and ensure that ARTIFACT_STORE is mounted to the container's -# internal ARTIFACT_STORE. -# -# Artifacts will be stored as follows: -# -# $ARTIFACT_STORE/$JOB_NAME/<dep_1>.<branch_1>.<rev_1>_... -# ..._<dep_n>.<tag_n>.tar.gz -# -# Note: each matrix-build has its own directory inside ARTIFACT_STORE. -# -# In order to make use of osmo-build.sh one needs to source it, e.g. from -# ./contrib/jenkins.sh. Furthermore, jenkins should check out the git tree of -# the project to be built in the workspace root. Following functions needs to be -# declared within a build script that sources osmo-build.sh: -# -# - artifact_name() -# - build_deps() -# - build_project() -# -# This is an example for building "libosmo-netif" which depends on "libosmocore" -# and "libosmo-abis". -# -# #!/bin/sh -# -# artifact_deps() { -# # $1 will be one of folllowing functions: -# # - artifact_name_by_local_repo() -# # - artifact_name_by_remote_repo() -# # osmo-build.sh takes care about which function to use -# -# x="$($1 libosmocore)" -# x="${x}_$($1 libosmo-abis)" -# -# echo "${x}.tar.gz" -# } -# -# build_deps() { -# # all commands to build necessary dependencies -# osmo-build-dep.sh libosmocore master ac_cv_path_DOXYGEN=false -# "$deps"/libosmocore/contrib/verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") -# osmo-build-dep.sh libosmo-abis -# } -# -# build_project() { -# # Necessary commands to build the project, expecting all dependencies have -# # been built or fetched. Commands within build_project() will be executed -# # in jenkins' $WORKSPACE. -# -# autoreconf --install --force -# ./configure --enable-sanitize -# $MAKE $PARALLEL_MAKE -# $MAKE distcheck || cat-testlogs.sh -# } -# -## -# # source osmo-build.sh to fire the build -# . osmo-build.sh - -log() { - set +x - echo - echo "[INFO] $1" - echo - set -x -} - -# SOURCING SANITY -log "source sanity check to ensure that sourcing script holds necessary functions" -type artifact_deps -type build_deps -type build_project -log "check whether necessary dependency build scripts are in PATH" -type osmo-build-dep.sh -type osmo-deps.sh - -# BUILD FUNCTIONS -init_build() { - - if [ -z "$JOB_NAME" ]; then - log "[ERROR] JOB_NAME variable is not set, running in Jenkins?" - exit 1 - fi - - if [ -z "$ARTIFACT_STORE" ]; then - log "[ERROR] ARTIFACT_STORE variable is not set on this build slave" - exit 1 - fi - - base="$(pwd)" - deps="$base/deps" - inst="$deps/install" - rm -rf "$deps" || true - - # obtain the project name from the git clone found in the workspace root - project=$(git config --get --local remote.origin.url \ - | cut -d '/' -f4 | cut -d '.' -f1) - - # replace invalid char for dirs in $JOB_NAME (jenkins variable) - # ( '/' separates job name and matrix-axis) - job_name="$( echo "$JOB_NAME" | tr '/' '_')" - - export base deps inst project job_name - export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" - export LD_LIBRARY_PATH="$inst/lib" - - log "$project build initialized" -} - -build() { - - init_build - - artifact_name="$(artifact_name)" - - if [ -f "$ARTIFACT_STORE/$job_name/$artifact_name" ]; then - fetch_artifact "$ARTIFACT_STORE/$job_name" "$artifact_name" - else - log "Compile $project dependencies from source." - mkdir -p "$deps" - rm -rf "$inst" - - build_deps - archive_artifact - fi - - log "building $project" - build_project -} - -# ARTIFACT FUNCTIONS -artifact_name() { - # in case deps is empty or does not exist we - if [ -d "$deps" ]; then - artifact_deps "branch_and_rev_of_local_repo" - cd "$base" - else - artifact_deps "branch_and_rev_of_remote_repo" - fi -} - -branch_and_rev_of_local_repo() { - cd "$deps/$1" - rev="$(git rev-parse --short HEAD)" - branch="$(git rev-parse --abbrev-ref HEAD)" - - # check whether it is a tag - if [ "$branch" = "HEAD" ]; then - tag="$(git describe --tags HEAD)" - tag="$(echo "$tag" | tr '/' '_')" - echo "$1.$tag" - else - branch="$( echo "$branch" | tr '/' '_')" - echo "$1.$branch.$rev" - fi -} - -branch_and_rev_of_remote_repo() { - if [ -z "${2+x}" ]; then branch="master"; else branch="$2"; fi - branch="$( echo "$branch" | tr '/' '_')" - rev="$(git ls-remote "https://gerrit.osmocom.org/$1" "refs/heads/$branch")" - - # check whether branch is a tag - if [ "$rev" = "" ]; then - echo "$1.$branch" - else - rev="$(echo "$rev" | cut -c 1-7)" - echo "$1.$branch.$rev" - fi -} - -archive_artifact() { - log "Archiving artifact to artifactStore." - - cd "$base" - artifact="$(artifact_name)" - # temp_job_store is necessary to atomically move it to production. - temp_job_store="$ARTIFACT_STORE/tmp/$job_name/" - job_store="$ARTIFACT_STORE/$job_name/" - - if [ ! -f "$temp_job_store/$artifact" ]; then - mkdir -p "$job_store" "$temp_job_store" - # remove outdated artifact first to avoid temporarily - # doubling of artifact storage consumption - rm -f "$job_store/*" - tar czf "$temp_job_store/$artifact" "deps" - mv -n "$temp_job_store/$artifact" "$job_store/$artifact" - rm -rf "$temp_job_store" - - log_artifact_hash "$job_store/$artifact" - fi -} - -fetch_artifact() { - log "Fetching artifact from artifactStore." - - log_artifact_hash "$1/$2" - cp "$1/$2" . - log_artifact_hash "$2" - tar xzf "$2" - - if [ $? -gt 0 ]; then - log "Artifact could not be fetched, triggering build_deps()" - build_deps - else - log "Artifact successfully fetched, triggering $project compilation" - fi -} - -# checksum is not used by script itself, -# but might be handy in logs when debugging. -log_artifact_hash() { - log "name: $1 \n sha256: $(sha256sum "$1" | cut -d ' ' -f1)" -} - -build -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id94d6126b476077d57839e4a884621b8c034f0c6 Gerrit-Change-Number: 31041 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023