November 2022 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: release-tarball-build-dist: fix missing dir crash

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30388 ) Change subject: release-tarball-build-dist: fix missing dir crash ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7c551e5376776eb267140bc4b897d5bb1634cbc Gerrit-Change-Number: 30388 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Nov 2022 16:40:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarball-build-dist: move rsync into docker

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30386 ) Change subject: release-tarball-build-dist: move rsync into docker ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6dfe5d587d05063c6cf2c9ec683e7b7e499b79c1 Gerrit-Change-Number: 30386 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Nov 2022 16:40:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarball-build-dist: order install pkgs

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30385 ) Change subject: release-tarball-build-dist: order install pkgs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I059f400db20e858b379704363e32d39a7897984a Gerrit-Change-Number: 30385 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Nov 2022 16:40:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarball-build-dist: check exists on server

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30387 ) Change subject: release-tarball-build-dist: check exists on server ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b8c149c9cdbe7c613eea5d9be15794de5e5ddce Gerrit-Change-Number: 30387 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Nov 2022 16:39:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarball-build-dist: fix permission errors

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/30389 to look at the new patch set (#2). Change subject: release-tarball-build-dist: fix permission errors ...................................................................... release-tarball-build-dist: fix permission errors Run all commands inside the docker containers as a user with the same UID as on the host system, not as root. This is a good idea in general and also fixes permission problems when jenkins tries to wipe the workspace. Related: OS#5793 Change-Id: I0d949e5ab4b1a709d18a316def0a98c3b244457e --- M release-tarball-build-dist/Dockerfile 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/89/30389/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0d949e5ab4b1a709d18a316def0a98c3b244457e Gerrit-Change-Number: 30389 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarball-build-dist: fix missing dir crash

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/30388 to look at the new patch set (#2). Change subject: release-tarball-build-dist: fix missing dir crash ...................................................................... release-tarball-build-dist: fix missing dir crash Don't fail if no tarball was generated and therefore the _release_tarballs directory does not exist. Related: OS#5793 Change-Id: Ib7c551e5376776eb267140bc4b897d5bb1634cbc --- M release-tarball-build-dist/osmocom-release-tarballs.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/88/30388/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7c551e5376776eb267140bc4b897d5bb1634cbc Gerrit-Change-Number: 30388 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarball-build-dist: order install pkgs

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30385 ) Change subject: release-tarball-build-dist: order install pkgs ...................................................................... release-tarball-build-dist: order install pkgs Change-Id: I059f400db20e858b379704363e32d39a7897984a --- M release-tarball-build-dist/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/85/30385/1 diff --git a/release-tarball-build-dist/Dockerfile b/release-tarball-build-dist/Dockerfile index bc0215e..dad9d0a 100644 --- a/release-tarball-build-dist/Dockerfile +++ b/release-tarball-build-dist/Dockerfile @@ -31,6 +31,7 @@ libgtpnl-dev \ liblimesuite-dev \ libncurses5-dev \ + libnl-route-3-dev \ liboping-dev \ liborcania-dev \ libortp-dev \ @@ -40,7 +41,6 @@ libosmo-mgcp-client-dev \ libosmo-netif-dev \ libosmo-ranap-dev \ - libnl-route-3-dev \ libosmo-rua-dev \ libosmo-sccp-dev \ libosmo-sigtran-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I059f400db20e858b379704363e32d39a7897984a Gerrit-Change-Number: 30385 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarball-build-dist: move rsync into docker

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30386 ) Change subject: release-tarball-build-dist: move rsync into docker ...................................................................... release-tarball-build-dist: move rsync into docker Prepare to use ssh inside the docker container to check if tarballs already exist, see the next patch. Remove the '' around UserKnownHostsFile as using SSH_COMMAND in the next patch without rsync fails otherwise with: command-line: line 0: Bad configuration option: 'userknownhostsfile Change-Id: I6dfe5d587d05063c6cf2c9ec683e7b7e499b79c1 --- M release-tarball-build-dist/Dockerfile M release-tarball-build-dist/jenkins.sh A release-tarball-build-dist/known_hosts M release-tarball-build-dist/osmocom-release-tarballs.sh 4 files changed, 13 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/86/30386/1 diff --git a/release-tarball-build-dist/Dockerfile b/release-tarball-build-dist/Dockerfile index dad9d0a..678efd4 100644 --- a/release-tarball-build-dist/Dockerfile +++ b/release-tarball-build-dist/Dockerfile @@ -67,6 +67,7 @@ make \ mscgen \ python3-nwdiag \ + rsync \ xsltproc \ && \ apt-get clean diff --git a/release-tarball-build-dist/jenkins.sh b/release-tarball-build-dist/jenkins.sh index 0177da8..d59aa15 100755 --- a/release-tarball-build-dist/jenkins.sh +++ b/release-tarball-build-dist/jenkins.sh @@ -8,21 +8,13 @@ docker run \ --rm=true \ -v "$PWD:/build" \ + -v "$(readlink -f $SSH_AUTH_SOCK)":/ssh-agent \ -w /osmo-ci \ -e KEEP_TEMP="$KEEP_TEMP" \ + -e SSH_AUTH_SOCK=/ssh-agent \ "$USER/release-tarball-build-dist" sh -e /build/osmocom-release-tarballs.sh if [ -z "$WORKSPACE" ]; then set +x echo "NOTE: not running on jenkins, skipping upload" fi - -cat > "$WORKSPACE/known_hosts" <<EOF -[ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 -[ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= -[ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX -EOF - -SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48" -cd _release_tarballs -rsync -avz --delete -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/ diff --git a/release-tarball-build-dist/known_hosts b/release-tarball-build-dist/known_hosts new file mode 100644 index 0000000..de29e93 --- /dev/null +++ b/release-tarball-build-dist/known_hosts @@ -0,0 +1,3 @@ +[ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 +[ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= +[ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index 02b81a6..04b8350 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -6,6 +6,7 @@ # Environment variables: # * KEEP_TEMP: do not delete cloned repositories (use for development) # * PARALLEL_MAKE: -jN argument for make (default: -j5). +SSH_COMMAND="ssh -o UserKnownHostsFile=/build/known_hosts -p 48" OSMO_GIT_URL="https://git.osmocom.org" OSMO_RELEASE_REPOS=" libasn1c @@ -315,6 +316,11 @@ esac } +upload() { + cd _release_tarballs + rsync -avz --delete -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/ +} + remove_temp_dir mkdir -p "$TEMP/repos" echo "Temp dir: $TEMP" @@ -346,4 +352,5 @@ done remove_temp_dir +upload echo "done!" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6dfe5d587d05063c6cf2c9ec683e7b7e499b79c1 Gerrit-Change-Number: 30386 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarball-build-dist: check exists on server

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30387 ) Change subject: release-tarball-build-dist: check exists on server ...................................................................... release-tarball-build-dist: check exists on server Previously this job relied on always running on the same jenkins node, and having the previously built release tarballs in a workspace directory that does not get removed. It would only skip building a release tarball if the file already exists locally. As part of OS#5793 this job needs to be moved away from that jenkins node. When trying to run the job on a different node, it will build all release tarballs again which takes unnecessarsily long and actually fails on libosmocore-0.9.4 due to a missing python2. This probably happens because the job was refactored at some point and I didn't realize that the python2 dep is now missing as the previous tarballs existed. In general it doesn't make much sense to build previous release tarballs again and to always keep the legacy environments around for that. Change the code to check if a tarball exists on the server, and skip building the tarball in that case. Related: OS#5793 Related: https://jenkins.osmocom.org/jenkins/view/All%20no%20Gerrit/job/Osmocom-rele… Change-Id: I4b8c149c9cdbe7c613eea5d9be15794de5e5ddce --- M release-tarball-build-dist/osmocom-release-tarballs.sh 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/87/30387/1 diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index 04b8350..8f3d3ac 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -191,6 +191,15 @@ fi } +get_existing_tarballs() { + if ! $SSH_COMMAND releases(a)ftp.osmocom.org -- \ + find web-files -name '*.tar.bz2' \ + > "$TEMP"/existing_tarballs; then + echo "ERROR: getting existing tarballs from remote failed!" + exit 1 + fi +} + # Clone an Osmocom repository to $TEMP/repos/$repo, clean it, checkout a tag. # $1: Osmocom repository (may end in subdir, e.g. simtrace2/host) # $2: tag (optional, default: master) @@ -318,13 +327,15 @@ upload() { cd _release_tarballs - rsync -avz --delete -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/ + rsync -avz -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/ } remove_temp_dir mkdir -p "$TEMP/repos" echo "Temp dir: $TEMP" +get_existing_tarballs + for repo in $OSMO_RELEASE_REPOS; do echo "$repo" tags="$(osmo_git_last_commits_tags "$repo" "all" | cut -d / -f 3)" @@ -342,7 +353,10 @@ echo " $tarball (ignored)" continue elif [ -e "$OUTPUT/$repo/$tarball" ]; then - echo " $tarball (exists)" + echo " $tarball (exists locally)" + continue + elif grep -q "^web-files/$repo/$tarball$" "$TEMP"/existing_tarballs; then + echo " $tarball (exists on server)" continue fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b8c149c9cdbe7c613eea5d9be15794de5e5ddce Gerrit-Change-Number: 30387 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in docker-playground[master]: release-tarballs-build-dist: fix missing dir crash

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30388 ) Change subject: release-tarballs-build-dist: fix missing dir crash ...................................................................... release-tarballs-build-dist: fix missing dir crash Don't fail if no tarball was generated and therefore the _release_tarballs directory does not exist. Related: OS#5793 Change-Id: Ib7c551e5376776eb267140bc4b897d5bb1634cbc --- M release-tarball-build-dist/osmocom-release-tarballs.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/88/30388/1 diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index 8f3d3ac..40f8c5e 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -326,6 +326,11 @@ } upload() { + if ! [ -d _release_tarballs ]; then + echo "upload: no tarballs generated, nothing to do." + return + fi + cd _release_tarballs rsync -avz -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/ } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7c551e5376776eb267140bc4b897d5bb1634cbc Gerrit-Change-Number: 30388 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022