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

[L] Change in osmo-ci[master]: jobs/osmocom-release-tarballs: modernize

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34160 ) Change subject: jobs/osmocom-release-tarballs: modernize ...................................................................... jobs/osmocom-release-tarballs: modernize Rewrite the osmocom-release-manuals script (previous version is in docker-playground Ic35a28a386170b85d32aab8f2bd33e48e6d45392): * Instead of using a separate docker container for this, that also lists all dependencies for all packages (as needed to pass ./configure), use debian-bookworm-build and install missing packages at time of generating the tarballs with "apt-get build-dep". Missing dependencies are typically other Osmocom libraries. * This allows removing the debian 11 based release-tarball-build-dist container. As the script doesn't depend on a separate docker container anymore, move it to osmo-ci.git. * Make it similar to scripts/manuals/publish-manuals-for-tags.sh, so it is easier to maintain both. Related: OS#6057 Change-Id: I9f8b671b9780da500637a64fc4dbc72b450f9d11 --- M .gitignore A contrib/known_hosts M jobs/osmocom-release-tarballs.yml A scripts/tarballs/publish-tarballs-for-tags.sh 4 files changed, 377 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 3fcbe85..517a620 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ _docker_playground _repo_install_test_data/ _temp_manuals/ +_temp_releases/ scripts/repo-install-test/run-inside-env.sh diff --git a/contrib/known_hosts b/contrib/known_hosts new file mode 100644 index 0000000..de29e93 --- /dev/null +++ b/contrib/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/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 2e6bb04..557898a 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -19,19 +19,18 @@ num-to-keep: 30 parameters: - string: - name: BRANCH_DOCKER_PLAYGROUND + name: BRANCH_OSMO_CI description: | - docker-playground.git branch where the Dockerfile gets pulled from + osmo-ci.git branch with scripts/tarballs/publish-tarballs-for-tags.sh default: 'master' builders: - shell: | - cd release-tarball-build-dist - ./jenkins.sh + PUBLISH=1 scripts/tarballs/publish-tarballs-for-tags.sh scm: - git: branches: - - '$BRANCH_DOCKER_PLAYGROUND' - url: https://gerrit.osmocom.org/docker-playground + - '$BRANCH_OSMO_CI' + url: https://gerrit.osmocom.org/osmo-ci git-config-name: 'Jenkins Builder' git-config-email: 'jenkins(a)osmocom.org' wipe-workspace: true diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh new file mode 100755 index 0000000..052e445 --- /dev/null +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -0,0 +1,342 @@ +#!/bin/sh -e +. "$(dirname "$0")/../common.sh" +OSMO_CI_DIR="$(realpath $(dirname "$0")/../..)" +TEMP="$OSMO_CI_DIR/_temp_releases" +WEB_PATH="/downloads/home/releases/web-files" +SSH_COMMAND="ssh -o UserKnownHostsFile=$OSMO_CI_DIR/contrib/known_hosts -p 48" +DOCKER_IMAGE="$USER/debian-bookworm-build" +LOG_PREFIX="::" + +OSMO_RELEASE_REPOS=" + libasn1c + libgtpnl + libosmo-abis + libosmo-netif + libosmo-pfcp + libosmo-sccp + libosmocore + libsmpp34 + libusrp + osmo-bsc + osmo-bts + osmo-cbc + osmo-e1d + osmo-gbproxy + osmo-ggsn + osmo-gsm-manuals + osmo-hlr + osmo-hnbgw + osmo-hnodeb + osmo-iuh + osmo-mgw + osmo-msc + osmo-pcap + osmo-pcu + osmo-remsim + osmo-sgsn + osmo-sip-connector + osmo-smlc + osmo-sysmon + osmo-trx + osmo-uecups + osmocom-bb + simtrace2 +" + +# Old release tags that are duplicates or where generating the tarball fails +TAGS_IGNORE=" + libosmocore:0.5.0, + libosmocore:0.5.1, + + libsmpp34:1.12, + + osmo-bsc:1.0.1, + osmo-bsc:1.1.0, + osmo-bsc:1.1.1, + osmo-bsc:1.1.2, + osmo-bsc:1.2.0, + osmo-bsc:1.2.1, + osmo-bsc:1.2.2, + + osmo-bts:0.2.0, + osmo-bts:0.3.0, + + osmo-hlr:0.0.1, + + osmo-mgw:1.0.1, + + osmo-msc:1.0.1, + + osmo-pcap:0.0.3, + + osmo-pcu:0.1, + osmo-pcu:0.2, + + osmo-sgsn:0.9.0, + osmo-sgsn:0.9.1, + osmo-sgsn:0.9.2, + osmo-sgsn:0.9.3, + osmo-sgsn:0.9.4, + osmo-sgsn:0.9.5, + osmo-sgsn:0.9.6, + osmo-sgsn:0.9.8, + osmo-sgsn:0.9.9, + osmo-sgsn:0.9.10, + osmo-sgsn:0.9.11, + osmo-sgsn:0.9.12, + osmo-sgsn:0.9.13, + osmo-sgsn:0.9.14, + osmo-sgsn:0.9.15, + osmo-sgsn:0.9.16, + osmo-sgsn:0.10.0, + osmo-sgsn:0.10.1, + osmo-sgsn:0.11.0, + osmo-sgsn:0.12.0, + osmo-sgsn:0.13.0, + osmo-sgsn:0.14.0, + osmo-sgsn:0.15.0, + osmo-sgsn:1.0.1, + + osmo-sip-connector:0.0.1, + + osmo-trx:0.2.0, + osmo-trx:0.3.0, + osmo-trx:1.3.0, +" + +mkdir -p \ + "$TEMP" \ + "$TEMP/src" + +check_ssh_auth_sock() { + if [ -z "$SSH_AUTH_SOCK" ]; then + echo "ERROR: SSH_AUTH_SOCK is not set" + exit 1 + fi +} + +# $1: path on server, e.g. "/releases/osmo-bsc" +get_server_ls() { + local dir="$1" + local out="$TEMP/ls$(echo "$dir" | tr / _)" + + echo "$LOG_PREFIX Listing files on server: $dir" + + if [ -e "$out" ]; then + echo "Skipped, file exists: $out" + return + fi + + dir="$(echo "$dir" | sed "s.^/releases.$WEB_PATH.")" + $SSH_COMMAND releases(a)ftp.osmocom.org "ls -1 $dir" >"$out" +} + +# $1: repository +get_git_tags() { + local repo="$1" + local out="$TEMP/git_tags_$repo" + + echo "$LOG_PREFIX Getting git tags" + + if [ -e "$out" ]; then + echo "Skipped, file exists: $out" + return + fi + + osmo_git_last_tags "$repo" "all" >"$out" +} + +# $1: repository +# $2: tag +tarball_exists() { + local repo="$1" + local tag="$2" + + grep -q "^$repo-$tag\.tar\." "$TEMP"/ls_releases_"$repo" +} + +# $1: repository +# $2: tag +is_tag_ignored() { + local repo="$1" + local tag="$2" + + case "$TAGS_IGNORE" in + *"$repo:$tag,"*) + return 0 + ;; + esac + + return 1 +} + +# $1: repository +# $2: tag +clone_repo() { + local repo="$1" + local tag="$2" + local gitdir="$TEMP/src/$repo" + + if ! [ -d "$gitdir" ]; then + local url="$(osmo_git_clone_url "$repo")" + echo "$LOG_PREFIX Cloning $url" + git -C "$TEMP/src" clone "$url" "$repo" + fi + + echo "$LOG_PREFIX Checkout $tag" + cd "$gitdir" + git reset --hard HEAD + git checkout "$tag" + git submodule update --init + git clean -dxf + + # Fix depends on packages that don't exist anymore + if [ -e debian/control ]; then + sed -i 's/dh-systemd $.*$,//g' debian/control + sed -i 's/python-minimal,//g' debian/control + fi +} + +# Get the desired tarball name, replace / with - in $1. +# $1: project path (osmo-bsc, osmo-msc, simtrace/host, etc.) +# $2: tag +get_tarball_name() { + local project_path="$1" + local tag="$2" + + echo "$(echo "$project_path" | tr / -)-$tag.tar.bz2" +} + +# $1: repository +# $2: project path (osmo-bsc, osmo-msc, simtrace/host, etc.) +# $3: tag +build_tarball() { + local repo="$1" + local project_path="$2" + local tag="$3" + local tarball_name="$(get_tarball_name "$project_path" "$tag")" + local uid_user="$(id -u)" + echo "$LOG_PREFIX Building release tarball: $tarball_name" + + if ! docker run \ + --rm \ + -e "DEBIAN_FRONTEND=noninteractive" \ + -v "$OSMO_CI_DIR/scripts/tarballs:/tarballs" \ + -v "$TEMP/src:/src" \ + "$DOCKER_IMAGE" \ + sh -ex -c " + cd /src/$repo + + if [ -e debian/control ]; then + apt-get update + apt-get -y build-dep . + fi + + cd /src/$project_path + + if [ -e configure.ac ]; then + su build -c \"autoreconf -fi\" + case \"$repo\" in + osmo-trx) + su build -c \"autoreconf -fi osmocom-bb/src/host/trxcon\" + su build -c \"./configure --with-mstrx\" + ;; + *) + su build -c \"./configure\" + ;; + esac + su build -c \"make dist-bzip2\" + else + su build -c \"git archive -o $tarball_name $tag\" + fi + "; then + echo "$LOG_PREFIX Building tarball failed!" + exit 1 + fi + + cd "$TEMP/src/$project_path" + + # Adjust the tarball name, e.g. for simtrace2-host-*.tar.bz2 + if ! [ -e "$tarball_name" ]; then + echo + mv -v *.tar.bz2 "$tarball_name" + echo + fi +} + +# $1: repository +# $2: tarball path within the repository dir +publish_tarball() { + local repo="$1" + local tarball="$2" + local tarball_path="$TEMP/src/$repo/$tarball" + local tarball_path_remote="releases@ftp.osmocom.org:$WEB_PATH/$repo/$(basename "$tarball")" + + echo "$LOG_PREFIX Publishing $tarball" + + if [ ! -e "$tarball_path" ]; then + echo "$LOG_PREFIX ERROR: tarball not found: $tarball_path" + exit 1 + fi + + if [ "$PUBLISH" != 1 ]; then + echo "$LOG_PREFIX Skipping, PUBLISH != 1" + return + fi + + rsync -vz -e "$SSH_COMMAND" "$tarball_path" $tarball_path_remote +} + +# $1: repository +# $2: tag +build_publish_tarballs() { + local repo="$1" + local tag="$2" + local tarballs="$repo-$tag.tar.bz2" + + build_tarball "$repo" "$repo" "$tag" + + case "$repo" in + simtrace2) + if [ -e "$TEMP"/src/simtrace2/host/configure.ac ]; then + build_tarball "simtrace2" "simtrace2/host" "$tag" + tarballs="$tarballs host/simtrace2-host-$tag.tar.bz2" + fi + ;; + esac + + for tarball in $tarballs; do + publish_tarball "$repo" "$tarball" + done +} + +check_ssh_auth_sock +get_server_ls "/releases" + +for repo in $OSMO_RELEASE_REPOS; do + LOG_PREFIX=":: ($repo)" + + if grep -q "^$repo$" "$TEMP/ls_releases"; then + get_server_ls "/releases/$repo" + else + echo "$LOG_PREFIX No release directory on server" + touch "$TEMP/ls_releases_$repo" + fi + + get_git_tags "$repo" + + echo "$LOG_PREFIX Building missing tarballs" + for tag in $(cat "$TEMP"/git_tags_"$repo"); do + LOG_PREFIX=":: ($repo, $tag)" + if tarball_exists "$repo" "$tag"; then + echo "$LOG_PREFIX Skipping, tarball exists" + continue + elif is_tag_ignored "$repo" "$tag"; then + echo "$LOG_PREFIX Skipping, tag is ignored" + continue + fi + + clone_repo "$repo" "$tag" + build_publish_tarballs "$repo" "$tag" + done +done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9f8b671b9780da500637a64fc4dbc72b450f9d11 Gerrit-Change-Number: 34160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-build: inkscape -> librsvg2-bin

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34162 ) Change subject: debian-bookworm-build: inkscape -> librsvg2-bin ...................................................................... debian-bookworm-build: inkscape -> librsvg2-bin Merge at the same time as the osmo-gsm-manuals patch. Depends: osmo-gsm-manuals I0d132f8f6fd73fbe14b5bfa10a8659acaddf38f7 Change-Id: I012c61eb777e6dc267dd4a52500da98c01ac1438 --- M debian-bookworm-build/Dockerfile 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index f019bd0..5c4c829 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -84,7 +84,6 @@ gnupg \ graphviz \ htop \ - inkscape \ iproute2 \ latexmk \ lcov \ @@ -97,6 +96,7 @@ libdbd-sqlite3 \ libdbi-dev \ libelf-dev \ + librsvg2-bin \ libffi-dev \ libfftw3-dev \ libgmp-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I012c61eb777e6dc267dd4a52500da98c01ac1438 Gerrit-Change-Number: 34162 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in docker-playground[master]: fpga-build: use debian-bookworm-build

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34163 ) Change subject: fpga-build: use debian-bookworm-build ...................................................................... fpga-build: use debian-bookworm-build * Remove code that is in debian-bookworm-build already (all packages that get installed, creating the build user, installing osmo-ci and osmo-gsm-manuals). * Put toolchain installations in single RUN commands, so the unextracted tarballs are not stored in image layers. Related: OS#6057 Change-Id: Iaaca6367b76a6ec860c63d57c767954f82edfee5 --- M fpga-build/Dockerfile 1 file changed, 26 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index 1421d29..a5444d2 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -1,51 +1,20 @@ ARG USER -FROM $USER/debian-buster-build +FROM $USER/debian-bookworm-build - +# Arguments used after FROM must be specified again ARG FPGA_TOOLCHAIN_DATE=20200914 ARG RISCV_TOOLCHAIN_VER=8.3.0-1.2 -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y --no-install-recommends \ - asciidoc \ - asciidoc-dblatex \ - dblatex \ - docbook5-xml \ - graphviz \ - inkscape \ - mscgen \ - python3-nwdiag \ - rsync \ - ssh \ - wget \ - xsltproc && \ - apt-get clean - - -RUN wget https://github.com/open-tool-forge/fpga-toolchain/releases/download/nightly… -RUN tar -C /opt -xf fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz && \ +# Install fpga-toolchain +RUN set -x && \ + wget --quiet https://github.com/open-tool-forge/fpga-toolchain/releases/download/nightly… && \ + tar -C /opt -xf fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz && \ rm fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz -RUN wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/down… -RUN tar -C /opt -xf /xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ +# Install riscv-none-embed-gcc +RUN set -x && \ + wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/down… && \ + tar -C /opt -xf /xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ rm xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz -# match the outside user -RUN useradd --uid=1000 build -RUN mkdir /build -RUN chown build:build /build - ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH} - -# Install osmo-ci.git/scripts to /usr/local/bin -ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit -RUN git clone https://gerrit.osmocom.org/osmo-ci.git && \ - cp -v $(find osmo-ci/scripts \ - -maxdepth 1 \ - -type f ) \ - /usr/local/bin - -# Install osmo-gsm-manuals to /opt/osmo-gsm-manuals -ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit -RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iaaca6367b76a6ec860c63d57c767954f82edfee5 Gerrit-Change-Number: 34163 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[L] Change in docker-playground[master]: release-tarball-build-dist: remove

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34164 ) Change subject: release-tarball-build-dist: remove ...................................................................... release-tarball-build-dist: remove Remove the container, as the job has been rewritten to not require its own docker container anymore, see the osmo-ci patch. Depends: osmo-ci I9f8b671b9780da500637a64fc4dbc72b450f9d11 Change-Id: Ic35a28a386170b85d32aab8f2bd33e48e6d45392 --- D release-tarball-build-dist/Dockerfile D release-tarball-build-dist/Makefile D release-tarball-build-dist/jenkins.sh D release-tarball-build-dist/known_hosts D release-tarball-build-dist/osmocom-release-tarballs.sh 5 files changed, 13 insertions(+), 504 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/release-tarball-build-dist/Dockerfile b/release-tarball-build-dist/Dockerfile deleted file mode 100644 index e8ffd21..0000000 --- a/release-tarball-build-dist/Dockerfile +++ /dev/null @@ -1,78 +0,0 @@ -ARG USER -FROM $USER/debian-bullseye-obs-latest -# Arguments used after FROM must be specified again -ARG UID - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - asciidoc \ - autoconf \ - autoconf-archive \ - autogen \ - automake \ - bison \ - build-essential \ - ca-certificates \ - dahdi-source \ - dblatex \ - git \ - graphviz \ - inkscape \ - libasn1c-dev \ - libboost-all-dev \ - libc-ares-dev \ - libcsv-dev \ - libdbd-sqlite3 \ - libdbi-dev \ - libfftw3-dev \ - libgnutls28-dev \ - libgps-dev \ - libgsm1-dev \ - libgtp-dev \ - libgtpnl-dev \ - liblimesuite-dev \ - libncurses5-dev \ - libnl-route-3-dev \ - liboping-dev \ - liborcania-dev \ - libortp-dev \ - libosmo-abis-dev \ - libosmo-gsup-client-dev \ - libosmo-hnbap-dev \ - libosmo-mgcp-client-dev \ - libosmo-netif-dev \ - libosmo-ranap-dev \ - libosmo-rua-dev \ - libosmo-sccp-dev \ - libosmo-sigtran-dev \ - libosmo-simtrace2-dev \ - libosmocore-dev \ - libosmodsp-dev \ - libpcap-dev \ - libpcsclite-dev \ - libreadline-dev \ - libsctp-dev \ - libsmpp34-dev \ - libsofia-sip-ua-glib-dev \ - libsqlite3-dev \ - libssl-dev \ - libtalloc-dev \ - libtool \ - libuhd-dev \ - libulfius-dev \ - libusb-1.0-0-dev \ - libusb-dev \ - libusrp-dev \ - libyder-dev \ - libzmq3-dev \ - make \ - mscgen \ - python3-nwdiag \ - rsync \ - wget \ - xsltproc \ - && \ - apt-get clean - -RUN useradd --uid=${UID} -m user -USER user diff --git a/release-tarball-build-dist/Makefile b/release-tarball-build-dist/Makefile deleted file mode 100644 index 736769d..0000000 --- a/release-tarball-build-dist/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -UPSTREAM_DISTRO=debian:bullseye -DISTRO=debian-bullseye -include ../make/Makefile diff --git a/release-tarball-build-dist/jenkins.sh b/release-tarball-build-dist/jenkins.sh deleted file mode 100755 index 8ea3c27..0000000 --- a/release-tarball-build-dist/jenkins.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -ex -. ../jenkins-common.sh - -docker_images_require \ - "debian-bullseye-obs-latest" \ - "release-tarball-build-dist" - -docker run \ - --rm=true \ - -v "$PWD:/build" \ - -v "$(readlink -f $SSH_AUTH_SOCK)":/ssh-agent \ - -w /osmo-ci \ - -e EXISTING_TARBALLS_FROM_JENKINS="$EXISTING_TARBALLS_FROM_JENKINS" \ - -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 diff --git a/release-tarball-build-dist/known_hosts b/release-tarball-build-dist/known_hosts deleted file mode 100644 index de29e93..0000000 --- a/release-tarball-build-dist/known_hosts +++ /dev/null @@ -1,3 +0,0 @@ -[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 deleted file mode 100644 index 8c41783..0000000 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ /dev/null @@ -1,399 +0,0 @@ -#!/bin/sh -e -# Iterate over all relevant Osmocom repositories and generate release tarballs for each of the repository tags. The tags -# are queried from the git server without cloning the repositories first, so we can clone them only if we need to build -# a missing tarball. All repositories are deleted afterwards to save space. -# -# Environment variables: -# * KEEP_TEMP: do not delete cloned repositories (use for development) -# * EXISTING_TARBALLS_FROM_JENKINS: set to 1 to get the existing tarballs from -# the last run of the jenkins job -SSH_COMMAND="ssh -o UserKnownHostsFile=/build/known_hosts -p 48" -OSMO_GIT_URL="https://git.osmocom.org" -OSMO_RELEASE_REPOS=" - libasn1c - libgtpnl - libosmo-abis - libosmo-netif - libosmo-pfcp - libosmo-sccp - libosmocore - libsmpp34 - libusrp - osmo-bsc - osmo-bts - osmo-cbc - osmo-e1d - osmo-gbproxy - osmo-ggsn - osmo-gsm-manuals - osmo-hlr - osmo-hnodeb - osmo-hnbgw - osmo-iuh - osmo-mgw - osmo-msc - osmo-pcap - osmo-pcu - osmo-remsim - osmo-sgsn - osmo-sip-connector - osmo-smlc - osmo-sysmon - osmo-trx - osmo-uecups - osmocom-bb - simtrace2 -" - -# Print last tags and related commits for an Osmocom git repository, e.g.: -# "ec798b89700dcca5c5b28edf1a1cd16ea311f30a refs/tags/1.0.1" -# $1: Osmocom repository -# $2: amount of commit, tag pairs to print (default: 1, set to "all" to print all) -# $3: string to print when there are no tags (default: empty string) -osmo_git_last_commits_tags() { - # git output: - # ec798b89700dcca5c5b28edf1a1cd16ea311f30a refs/tags/1.0.1 - # eab5f594b0a7cf50ad97b039f73beff42cc8312a refs/tags/1.0.1^{} - # ... - # 41e7cf115d4148a9f34fcb863b68b2d5370e335d refs/tags/1.3.1^{} - # 8a9f12dc2f69bf3a4e861cc9a81b71bdc5f13180 refs/tags/3G_2016_09 - # ee618ecbedec82dfd240334bc87d0d1c806477b0 refs/tags/debian/0.9.13-0_jrsantos.1 - # a3fdd24af099b449c9856422eb099fb45a5595df refs/tags/debian/0.9.13-0_jrsantos.1^{} - # ... - ret="$(git ls-remote --tags "$OSMO_GIT_URL/$1")" - ret="$(echo "$ret" | grep 'refs/tags/[0-9.]*$' || true)" - ret="$(echo "$ret" | sort -V -t/ -k3)" - if [ "$2" != "all" ]; then - ret="$(echo "$ret" | tail -n "$2")" - fi - - if [ -n "$ret" ]; then - echo "$ret" - else - echo "$3" - fi -} - - -cd "$(dirname "$0")" -OUTPUT="/build/_release_tarballs" -TEMP="/build/_temp" - -# Print all tags for which no release tarball should be built. -# $1: Osmocom repository -tags_to_ignore() { - case "$1" in - libosmocore) - # configure.ac:144: error: required file 'src/gb/Makefile.in' not found - echo "0.5.0" - echo "0.5.1" - ;; - libsmpp34) - # duplicate of 1.12.0 - echo "1.12" - ;; - osmo-bsc) - # openbsc - echo "1.0.1" - # Requires libosmo-legacy-mgcp - echo "1.1.0" - echo "1.1.1" - echo "1.1.2" - echo "1.2.0" - echo "1.2.1" - echo "1.2.2" - ;; - osmo-bts) - # gsm_data_shared.h:464:26: error: field 'power_params' has incomplete type - echo "0.2.0" - echo "0.3.0" - ;; - osmo-hlr) - # Not using autotools - echo "0.0.1" - ;; - osmo-mgw) - # openbsc - echo "1.0.1" - ;; - osmo-msc) - # openbsc - echo "1.0.1" - ;; - osmo-pcap) - # No rule to make target 'osmo-pcap-server.cfg', needed by 'distdir' - echo "0.0.3" - ;; - osmo-pcu) - # Duplicates of 0.1.0, 0.2.0 - echo "0.1" - echo "0.2" - ;; - osmo-sgsn) - # openbsc - echo "0.9.0 0.9.1 0.9.2 0.9.3 0.9.4 0.9.5 0.9.6 0.9.8 0.9.9 0.9.10 0.9.11 0.9.12 0.9.13 0.9.14" - echo "0.9.15 0.9.16 0.10.0 0.10.1 0.11.0 0.12.0 0.13.0 0.14.0 0.15.0 1.0.1" - ;; - osmo-sip-connector) - # make: *** No rule to make target 'osmoappdesc.py' - echo "0.0.1" - ;; - osmo-trx) - # cp: cannot stat './/home/user/code/osmo-dev/src/osmo-ci/_temp/repos/osmo-trx/configure' - echo "0.2.0" - echo "0.3.0" - echo "1.3.0" - ;; - esac -} - -# Clone dependency repositories. -# $1: Osmocom repository -prepare_depends() { - case "$1" in - osmo-bts) - # Includes openbsc/gsm_data_shared.h - prepare_repo "openbsc" - ;; - esac -} - -# Run ./configure, with arguments if needed. -# $1: Osmocom repository -run_configure() { - case "$1" in - osmo-trx) - # Avoid pointing LIBTRXCON_DIR to an empty directory: - # https://gerrit.osmocom.org/c/osmo-trx/+/30792 - if grep -q with_mstrx configure.ac; then - ./configure --with-mstrx - fi - ;; - *) - ./configure - ;; - esac -} - -# Apply workarounds for bugs that break too many releases. This function runs between ./configure and make dist-bzip2. -# $1: Osmocom repository -fix_repo() { - case "$1" in - osmo-mgw) - # No rule to make target 'osmocom/mgcp_client/mgcp_common.h' (OS#4084) - make -C "$TEMP/repos/$1/include/osmocom/mgcp_client" mgcp_common.h || true - ;; - esac -} - -# Check if one specific tag should be ignored. -# $1: Osmocom repository -# $2: tag (e.g. "1.0.0") -ignore_tag() { - local repo="$1" - local tag="$2" - local tags="$(tags_to_ignore "$repo")" - for tag_i in $tags; do - if [ "$tag" = "$tag_i" ]; then - return 0 - fi - done - return 1 -} - -# Delete existing temp dir (unless KEEP_TEMP is set). If all repos were checked out, this restores ~500 MB of space. -remove_temp_dir() { - if [ -n "$KEEP_TEMP" ]; then - echo "NOTE: not removing temp dir, because KEEP_TEMP is set: $TEMP" - elif [ -d "$TEMP" ]; then - rm -rf "$TEMP" - fi -} - -get_existing_tarballs() { - if [ -n "$EXISTING_TARBALLS_FROM_JENKINS" ]; then - wget -O "$TEMP"/existing_tarballs \ - https://jenkins.osmocom.org/jenkins/job/Osmocom-release-tarballs/ws/release… - elif ! $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) -prepare_repo() { - local repo="$1" - local tag="${2:-master}" - - if ! [ -d "$TEMP/repos/$repo" ]; then - git -C "$TEMP/repos" clone --recursive "$OSMO_GIT_URL/$repo" - fi - - cd "$TEMP/repos/$repo" - git clean -qdxf - git reset --hard HEAD # in case the tracked files were modified (e.g. libsmpp34 1.10) - git checkout -q "$tag" - git submodule update --recursive -} - - -# Get the desired tarball name, replace / with - in $1. -# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host) -# $2: tag -tarball_name() { - echo "$(echo "$repo" | tr / -)-$tag.tar.bz2" -} - -# Checkout a given tag and build a release tarball. -# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host) -# $2: tag -create_tarball() { - local repo="$1" - local tag="$2" - local tarball="$(tarball_name "$repo" "$tag")" - - # Be verbose during the tarball build and preparation. Everything else is not verbose, so we can generate an - # easy to read overview of tarballs that are already built or are ignored. - set -x - - prepare_repo "$repo" "$tag" - prepare_depends "$repo" - - cd "$TEMP/repos/$repo" - autoreconf -fi - run_configure "$repo" - fix_repo "$repo" - make dist-bzip2 - - # Back to non-verbose mode - set +x - - if ! [ -e "$tarball" ]; then - echo "NOTE: tarball has a different name (wrong version in configure.ac?), renaming." - mv -v *.tar.bz2 "$tarball" - fi -} - -# Create a release tarball with "git archive" for non-autotools projects. -# $1: Osmocom repository -# $2: tag -create_tarball_git() { - local repo="$1" - local tag="$2" - local tarball="$(tarball_name "$repo" "$tag")" - - set -x - - cd "$TEMP/repos/$repo" - git archive \ - -o "$tarball" \ - "$tag" - - set +x -} - -# Move a generated release tarball to the output dir. -# $1: Osmocom repository (may end in subdir, e.g. simtrace2/host) -# $2: tag -move_tarball() { - local repo="$1" - local tag="$2" - local tarball="$(tarball_name "$repo" "$tag")" - local repo_dir="$(echo "$repo" | cut -d / -f 1)" - - cd "$TEMP/repos/$repo" - mkdir -p "$OUTPUT/$repo_dir" - mv "$tarball" "$OUTPUT/$repo_dir/$tarball" -} - -# Check if a git tag has a specific file -# $1: Osmocom repository -# $2: tag -# $3: file -tag_has_file() { - local repo="$1" - local tag="$2" - local file="$3" - - git -C "$TEMP/repos/$repo" show "$tag:$file" >/dev/null 2>&1 -} - -# Create and move tarballs for Osmocom repositories. -# $1: Osmocom repository -# $2: tag -create_move_tarball() { - local repo="$1" - local tag="$2" - - case "$repo" in - simtrace2) - if tag_has_file "$repo" "$tag" host/configure.ac; then - create_tarball "$repo/host" "$tag" - move_tarball "$repo/host" "$tag" - else - prepare_repo "$repo" - fi - - create_tarball_git "$repo" "$tag" - move_tarball "$repo" "$tag" - ;; - *) - create_tarball "$repo" "$tag" - move_tarball "$repo" "$tag" - ;; - esac -} - -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/ -} - -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)" - - # Skip untagged repos - if [ -z "$tags" ]; then - echo " (repository has no release tags)" - continue - fi - - # Build missing tarballs for each tag - for tag in $tags; do - tarball="$repo-$tag.tar.bz2" - if ignore_tag "$repo" "$tag"; then - echo " $tarball (ignored)" - continue - elif [ -e "$OUTPUT/$repo/$tarball" ]; then - echo " $tarball (exists locally)" - continue - elif grep -q "^web-files/$repo/$tarball$" "$TEMP"/existing_tarballs; then - echo " $tarball (exists on server)" - continue - fi - - echo " $tarball (creating)" - create_move_tarball "$repo" "$tag" - done -done - -cd /build -remove_temp_dir -upload -echo "done!" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic35a28a386170b85d32aab8f2bd33e48e6d45392 Gerrit-Change-Number: 34164 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in docker-playground[master]: Cosmetic: debian-buster-jenkins: update comment

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34165 ) Change subject: Cosmetic: debian-buster-jenkins: update comment ...................................................................... Cosmetic: debian-buster-jenkins: update comment Related: OS#6126 Change-Id: I15be64a662e97e7e819abeda1c6c955d8198176c --- M debian-buster-jenkins/Dockerfile 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index f20e1a8..6dffc25 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -1,4 +1,4 @@ -# Image used to run contrib/jenkins.sh scripts of most Osmocom projects. +# osmo-gsm-tester is still using this (OS#6126). # See master-builds.yml, gerrit-verifications.yml in osmo-ci.git. ARG DEBIAN_VERSION=buster -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I15be64a662e97e7e819abeda1c6c955d8198176c Gerrit-Change-Number: 34165 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-gsm-manuals[master]: build: replace inkscape with rsvg-convert

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34158 ) Change subject: build: replace inkscape with rsvg-convert ...................................................................... build: replace inkscape with rsvg-convert Do not require having the graphical application inkscape and all its dependencies installed, just to convert svgs to pdfs. This is still the default in dblatex, even though converting on the command-line with inkscape is deprecated. Use the lightweight rsvg-convert instead. Merge at the same time as the docker-playground patch. Depends: docker-playground I012c61eb777e6dc267dd4a52500da98c01ac1438 Change-Id: I0d132f8f6fd73fbe14b5bfa10a8659acaddf38f7 --- M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc A build/dblatex_config.xml M check-depends.sh M debian/control 5 files changed, 49 insertions(+), 6 deletions(-) Approvals: osmith: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 75aa36f..7dd38d6 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -46,7 +46,12 @@ -a srcdir='$(ABS_SRCDIR)' \ -a commondir='$(COMMONDIR)' \ $(NULL) -DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0 +DBLATEX_OPTS := \ + --config $(OSMO_GSM_MANUALS_DIR)/build/dblatex_config.xml \ + -s $(ASCIIDOCSTYLE) \ + -P draft.mode=yes \ + -P draft.watermark=0 \ + $(NULL) ifeq (,$(BUILD_RELEASE)) REVNUMBER := DRAFT $(GIT_VERSION) diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index df17646..6eb48d0 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -50,6 +50,11 @@ export REVNUMBER="$(REVNUMBER)" && \ export TEMPFILE="$(INC_DIR)/_temp_$(notdir $<)" && \ $(OSMO_GSM_MANUALS_DIR)/build/docbook-set-revhistory.py "$<" && \ - dblatex --xslt-opts="--path $(realpath $(OSMO_GSM_MANUALS_DIR))/common/chapters:$(INC_DIR)" \ - $(dblatex_quiet) -P draft.mode=no -o $@ "$$TEMPFILE" && \ + dblatex \ + --config $(OSMO_GSM_MANUALS_DIR)/build/dblatex_config.xml \ + --xslt-opts="--path $(realpath $(OSMO_GSM_MANUALS_DIR))/common/chapters:$(INC_DIR)" \ + $(dblatex_quiet) \ + -P draft.mode=no \ + -o $@ \ + "$$TEMPFILE" && \ rm $$TEMPFILE diff --git a/build/dblatex_config.xml b/build/dblatex_config.xml new file mode 100644 index 0000000..bd89ea7 --- /dev/null +++ b/build/dblatex_config.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" ?> + +<config xmlns="http://dblatex.sourceforge.net/config"> + <imagedata> + <converter src="svg" dst="*" docformat="pdf"> + <command> + rsvg-convert -a -f %(dst)s -o %(output)s %(input)s + </command> + </converter> + </imagedata> +</config> diff --git a/check-depends.sh b/check-depends.sh index f072fd8..46da717 100755 --- a/check-depends.sh +++ b/check-depends.sh @@ -15,6 +15,6 @@ check_dep_bin dblatex dblatex check_dep_bin packetdiag3 python3-nwdiag check_dep_bin dot graphviz -check_dep_bin inkscape inkscape +check_dep_bin rsvg-convert librsvg2-bin echo "All dependencies installed!" diff --git a/debian/control b/debian/control index cdf990c..908ca99 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ dblatex, docbook5-xml, graphviz, - inkscape, + librsvg2-bin, libxml2-utils, mscgen, python3-nwdiag, @@ -28,7 +28,7 @@ dblatex, docbook5-xml, graphviz, - inkscape, + librsvg2-bin, libxml2-utils, mscgen, python3-nwdiag, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I0d132f8f6fd73fbe14b5bfa10a8659acaddf38f7 Gerrit-Change-Number: 34158 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in osmo-gsm-manuals[master]: build/Makefile.asciidoc: print less clutter

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34157 ) Change subject: build/Makefile.asciidoc: print less clutter ...................................................................... build/Makefile.asciidoc: print less clutter * Move the comments above the build targets, so they don't get printed during the build * Remove the "TO REMOVE DRAFT MODE…" note. Printing this is no longer useful, the manuals for releases are now generated automatically with the Osmocom-release-manuals jenkins job, which removes the draft mode. There is no need to do this step manually. Depends: osmo-ci Ia27cb8e4dd0204c0a91c322bed65bf8c9847a7be Change-Id: I23d11bab274793eb8bcedc3fd9290901823e32d2 --- M build/Makefile.asciidoc.inc 1 file changed, 28 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 848f1f1..75aa36f 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -59,6 +59,12 @@ all: $(ASCIIDOC_PDF) +# ln: a2x can't use a different output file. To support out-of-tree builds, +# we create a symlink at $(builddir)/srcfile.adoc pointing at +# $(srcdir)/srcfile.adoc. $< is the $(srcdir)/srcfile.adoc, +# $(notdir) is like basename from coreutils, and $(builddir) is $PWD. +# TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} +# in $(OSMO_GSM_MANUALS_DIR). $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ $(ASCIIDOC_DEPS) \ $(ASCIIDOCSTYLE) \ @@ -66,20 +72,10 @@ $(COMMONDIR)/images/* \ build common - # a2x can't use a different output file. To support out-of-tree builds, - # we create a symlink at $(builddir)/srcfile.adoc pointing at - # $(srcdir)/srcfile.adoc. $< is the $(srcdir)/srcfile.adoc, - # $(notdir) is like basename from coreutils, and $(builddir) is $PWD. if ! [ -f $(notdir $<) ]; then \ ln -s $< $(notdir $<); \ fi - # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} - # in $(OSMO_GSM_MANUALS_DIR). - @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ - NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ - and remove three lines starting with '% \"DRAFT\" on first page'\n" \ - || true TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ a2x -vv $(A2X_OPTS) $(notdir $<) @@ -88,23 +84,22 @@ $(MAKE) $(ASCIIDOC_CHECKS); \ fi +# ln: out-of-tree building: use a symlink to the output file like done in +# the non-check build above, so the relative include paths work the same. +# touch: Make absolutely sure that the %.check target is updated. +# grep: Do print the WARNING output but return error if any was found +# (grep -v would omit the WARNING output from the log). $(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \ $(ASCIIDOCSTYLE) \ $(COMMONDIR)/chapters/*.adoc \ $(ASCIIDOC_DEPS) \ build common - # out-of-tree building: use a symlink to the output file like done in - # the non-check build above, so the relative include paths work the - # same. if ! [ -f $(notdir $<) ]; then \ ln -s $< $(notdir $<); \ fi asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<) > $(notdir $@) 2>&1 - # Make absolutely sure that the %.check target is updated. touch $(notdir $@) - # Do print the WARNING output but return error if any was found - # (grep -v would omit the WARNING output from the log). @grep WARNING $(notdir $@) && exit 1 || exit 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/34157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I23d11bab274793eb8bcedc3fd9290901823e32d2 Gerrit-Change-Number: 34157 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in osmo-mgw[master]: vty: include local port when dumping RTP conns

by pespin

Attention is currently required from: keith, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34150 ) Change subject: vty: include local port when dumping RTP conns ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp/mgcp_conn.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34150/comment/712e9a25_859ee55c PS1, Line 373: "rtp:%u<->%u rtcp:%u)", > One /could/ print the local IP here, yes, but will it ever change? There's only one bound IP for RTP […] with ip probe enabled, the local IP address may change for each connection depending on the routing and remote ip address. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib89a6779e1d68c6600f00699d4303f6c0ee07132 Gerrit-Change-Number: 34150 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Aug 2023 08:03:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: keith <keith(a)rhizomatica.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-mgw[master]: vty: include local port when dumping RTP conns

by keith

Attention is currently required from: pespin, dexter. keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34150 ) Change subject: vty: include local port when dumping RTP conns ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp/mgcp_conn.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34150/comment/57dcd037_8f21cc49 PS1, Line 373: "rtp:%u<->%u rtcp:%u)", > You could also do something like "l:%s<->r:%s (rtcp: %u<->%u)" or alike. One /could/ print the local IP here, yes, but will it ever change? There's only one bound IP for RTP in the MGW, correct? I don't really want to get into bike shedding about it. I'm happy enough to maintain this in rhizomatica branch, or to +1 (or not) if somebody else wants to UL an alternative patch. :-) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib89a6779e1d68c6600f00699d4303f6c0ee07132 Gerrit-Change-Number: 34150 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Aug 2023 22:29:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in libosmo-sccp[master]: asp: Monitor SCTP_PEER_ADDR_CHANGE events to re-apply configured Prim...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34112 ) Change subject: asp: Monitor SCTP_PEER_ADDR_CHANGE events to re-apply configured Primary Address ...................................................................... asp: Monitor SCTP_PEER_ADDR_CHANGE events to re-apply configured Primary Address The kernel doesn't store state about a "always-preferred" Primary address, it simply applies the requested one at the time the request is done. If afterwards the remote address becomes unavailable, the kernel will end up giving up on it and selecting anoter one as primary address. If the VTY-configured Primary Address become available after a while (signaled by the kernel in the SCTP_PEER_ADDR_CHANGE), make sure to apply it again. Similary, if the peer sends us an ASCONF changing our Primary Address, we should discard that and apply/overwrite *iff* the user explicitly VTY-configured one (kernel announces the change through SCTP_ADDR_MADE_PRIM in this scenario). Related: OS#6076 Change-Id: I2e54e6f9e424350474db6dec6ab604b33a03f88b --- M src/osmo_ss7.c 1 file changed, 96 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 7882bc2..b8124d1 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1478,6 +1478,76 @@ return rc; } +/* Returns whether the address signalled in the SCTP_PEER_ADDR_CHANGE matches + * the user-configured Primary Address. */ +static bool sctp_peer_addr_change_ev_addr_matches_our_primary(const struct osmo_ss7_asp *asp, + const union sctp_notification *notif) +{ + const char *primary_str; + int primary_str_type; + struct osmo_sockaddr ev_addr, primary; + + OSMO_ASSERT(asp->cfg.remote.idx_primary >= 0); + + primary_str = asp->cfg.remote.host[asp->cfg.remote.idx_primary]; + primary_str_type = osmo_ip_str_type(primary_str); + memcpy(&ev_addr.u.sas, &notif->sn_paddr_change.spc_aaddr, sizeof(ev_addr.u.sas)); + + /* This whole switch is to properly compare addresses (take into account v6mapped IPv4 addresses): */ + switch (ev_addr.u.sa.sa_family) { + case AF_INET: + switch (primary_str_type) { + case AF_INET: + primary = ev_addr; /* Copy AF + port */ + inet_pton(AF_INET, primary_str, &primary.u.sin.sin_addr); + return (osmo_sockaddr_cmp(&primary, &ev_addr) == 0); + case AF_INET6: + /* for sure not the same */ + return false; + } + return false; + case AF_INET6: + /* "ev_addr" can either be a IPv6 addr or a v6-mapped IPv4 + * address. Compare both as IPv6 (or v6-mapped IPv4) addresses. */ + primary = ev_addr; /* Copy AF + port */ + inet_pton(AF_INET6, primary_str, &primary.u.sin6.sin6_addr); + return (osmo_sockaddr_cmp(&primary, &ev_addr) == 0); + default: + return false; + } +} + +/* Simple SCTP Path-manager tracking/driving the VTY-user-configured primary + * address against the kernel when assoc state changes: */ +static void asp_handle_sctp_notif_monitor_primary_address(const struct osmo_ss7_asp *asp, + const union sctp_notification *notif) +{ + bool match; + + if (asp->cfg.remote.idx_primary == -1) + return; + if (notif->sn_header.sn_type != SCTP_PEER_ADDR_CHANGE) + return; + + switch (notif->sn_paddr_change.spc_state) { + case SCTP_ADDR_AVAILABLE: + case SCTP_ADDR_ADDED: + case SCTP_ADDR_CONFIRMED: + /* If our primary addr became available/added/confirmed, set it */ + match = sctp_peer_addr_change_ev_addr_matches_our_primary(asp, notif); + if (match) + asp_apply_primary_address(asp); + break; + case SCTP_ADDR_MADE_PRIM: + /* If another primary addr was made primary, overwrite it by setting it again */ + match = sctp_peer_addr_change_ev_addr_matches_our_primary(asp, notif); + if (!match) + asp_apply_primary_address(asp); + default: + break; + } +} + static bool ipv6_sctp_supported(const char *host, bool bind) { int rc; @@ -2001,6 +2071,7 @@ if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); log_sctp_notification(asp, "xUA CLNT", notif); + asp_handle_sctp_notif_monitor_primary_address(asp, notif); switch (notif->sn_header.sn_type) { case SCTP_ASSOC_CHANGE: @@ -2147,6 +2218,7 @@ if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); log_sctp_notification(asp, "xUA CLNT", notif); + asp_handle_sctp_notif_monitor_primary_address(asp, notif); switch (notif->sn_header.sn_type) { case SCTP_ASSOC_CHANGE: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I2e54e6f9e424350474db6dec6ab604b33a03f88b Gerrit-Change-Number: 34112 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023