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

Change in docker-playground[master]: Install ca-certificates before Osmocom repo

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28416 ) Change subject: Install ca-certificates before Osmocom repo ...................................................................... Install ca-certificates before Osmocom repo Prepare for using https://downloads.osmocom.org/packages/ instead of http://download.opensuse.org to download packages. Install ca-certificates before attempting to use the repository, otherwise it will print a warning and not use the repository and e.g. install eclipse-titan from debian's repository instead of our repo. Fix for: W: https://downloads.osmocom.org/packages/osmocom:/latest/Debian_11/./InRelease: No system certificates available. Try installing ca-certificates. Related: OS#5557 Change-Id: Icb6764601671b6e66591f33ede6d0f822811545a --- M debian-bullseye-build/Dockerfile M debian-bullseye-erlang/Dockerfile M debian-bullseye-obs-latest/Dockerfile M debian-bullseye-titan/Dockerfile M debian-buster-build/Dockerfile M debian-buster-jenkins/Dockerfile M debian-jessie-osmocom/Dockerfile M debian-sid-jenkins/Dockerfile M debian-stretch-build/Dockerfile M debian-stretch-jenkins/Dockerfile M debian-stretch-obs-latest/Dockerfile M osmo-ran/Dockerfile M osmo-ran/split/ran-bsc_mgw/Dockerfile M osmo-ran/split/ran-bts_pcu/Dockerfile M osmo-ran/split/ran-trx-ipc/Dockerfile M osmo-ran/split/ran-trx-uhd/Dockerfile 16 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/16/28416/1 diff --git a/debian-bullseye-build/Dockerfile b/debian-bullseye-build/Dockerfile index baeba30..3c8bf4b 100644 --- a/debian-bullseye-build/Dockerfile +++ b/debian-bullseye-build/Dockerfile @@ -15,6 +15,7 @@ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile index aeff1c7..9c3d4f3 100644 --- a/debian-bullseye-erlang/Dockerfile +++ b/debian-bullseye-erlang/Dockerfile @@ -44,6 +44,7 @@ # add osmocom latest repo, should we ever require packages from there RUN apt-get update && apt-get install -y \ + ca-certificates \ gnupg COPY .common/Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ diff --git a/debian-bullseye-obs-latest/Dockerfile b/debian-bullseye-obs-latest/Dockerfile index fb8cd93..6707838 100644 --- a/debian-bullseye-obs-latest/Dockerfile +++ b/debian-bullseye-obs-latest/Dockerfile @@ -10,6 +10,7 @@ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ telnet \ + ca-certificates \ gnupg \ && \ apt-get clean diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 125f02b..576041c 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -8,6 +8,7 @@ ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_11/" RUN apt-get update && apt-get install -y \ + ca-certificates \ gnupg COPY .common/Release.key /tmp/Release.key diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index b80d881..7000ca5 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -15,6 +15,7 @@ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 6bbd389..04c6c4c 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -26,6 +26,7 @@ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile index 08fb320..011f5aa 100644 --- a/debian-jessie-osmocom/Dockerfile +++ b/debian-jessie-osmocom/Dockerfile @@ -9,6 +9,9 @@ COPY .common/Release.key /tmp/Release.key +RUN apt-get update && apt-get install -y \ + ca-certificates + RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list diff --git a/debian-sid-jenkins/Dockerfile b/debian-sid-jenkins/Dockerfile index 411b640..944e514 100644 --- a/debian-sid-jenkins/Dockerfile +++ b/debian-sid-jenkins/Dockerfile @@ -26,6 +26,7 @@ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index b04eb8e..b144e13 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -15,6 +15,7 @@ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index b5c36fb..d44e394 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -26,6 +26,7 @@ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile index aaf1b43..fe3420b 100644 --- a/debian-stretch-obs-latest/Dockerfile +++ b/debian-stretch-obs-latest/Dockerfile @@ -9,6 +9,7 @@ RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ + ca-certificates \ telnet \ gnupg \ && \ diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile index 64697c6..07c8551 100644 --- a/osmo-ran/Dockerfile +++ b/osmo-ran/Dockerfile @@ -16,6 +16,7 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile index e0e3b15..03c16fe 100644 --- a/osmo-ran/split/ran-bsc_mgw/Dockerfile +++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile @@ -16,6 +16,7 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile index d8b9bcd..0129b75 100644 --- a/osmo-ran/split/ran-bts_pcu/Dockerfile +++ b/osmo-ran/split/ran-bts_pcu/Dockerfile @@ -16,6 +16,7 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile index e273da9..467adab 100644 --- a/osmo-ran/split/ran-trx-ipc/Dockerfile +++ b/osmo-ran/split/ran-trx-ipc/Dockerfile @@ -16,6 +16,7 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile index adc764a..3603685 100644 --- a/osmo-ran/split/ran-trx-uhd/Dockerfile +++ b/osmo-ran/split/ran-trx-uhd/Dockerfile @@ -16,6 +16,7 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icb6764601671b6e66591f33ede6d0f822811545a Gerrit-Change-Number: 28416 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: Use Osmocom OBS

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28417 ) Change subject: Use Osmocom OBS ...................................................................... Use Osmocom OBS Related: OS#5557 Change-Id: I880f8134e4f7e6ae4125237e6b3983c04cea9ec6 --- M README.md M centos7-build/Dockerfile M centos7-obs-latest/Dockerfile M centos8-build/Dockerfile M centos8-obs-latest/Dockerfile M common/Release.key M debian-bullseye-build/Dockerfile M debian-bullseye-erlang/Dockerfile M debian-bullseye-obs-latest/Dockerfile M debian-bullseye-titan/Dockerfile M debian-buster-build/Dockerfile M debian-buster-jenkins/Dockerfile M debian-buster-simtrace2/Dockerfile M debian-jessie-osmocom/Dockerfile M debian-sid-jenkins/Dockerfile M debian-stretch-build/Dockerfile M debian-stretch-jenkins/Dockerfile M debian-stretch-obs-latest/Dockerfile M make/Makefile M osmo-ran/Dockerfile M osmo-ran/split/ran-bsc_mgw/Dockerfile M osmo-ran/split/ran-bts_pcu/Dockerfile M osmo-ran/split/ran-trx-ipc/Dockerfile M osmo-ran/split/ran-trx-uhd/Dockerfile 24 files changed, 70 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/17/28417/1 diff --git a/README.md b/README.md index 9a1889e..dd3d992 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ 2021q1-centos8: ``` -export OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org" +export OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" export OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" export OSMOCOM_REPO_PATH="osmo-maintained" export OSMOCOM_REPO_VERSION="2021q1" @@ -75,7 +75,7 @@ The OBS repository mirror consists of `${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}`, -e.g. `https://download.opensuse.org/repositories/network:/osmocom:/latest/`. +e.g. `https://downloads.osmocom.org/packages/osmocom:/latest/`. ### Creating kernel config fragments For the kernel tests, we are storing kernel config fragments in the git diff --git a/centos7-build/Dockerfile b/centos7-build/Dockerfile index 2e04efb..f449d42 100644 --- a/centos7-build/Dockerfile +++ b/centos7-build/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=centos:centos7 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" # Use dnf package manager instead of yum, so we can use all the dnf codepaths # that were originally written for CentOS8 in this CentOS7 image too diff --git a/centos7-obs-latest/Dockerfile b/centos7-obs-latest/Dockerfile index dfe12fc..2c06882 100644 --- a/centos7-obs-latest/Dockerfile +++ b/centos7-obs-latest/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=centos:centos7 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO_VERSION="latest" # Use dnf package manager instead of yum, so we can use all the dnf codepaths diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile index 26ef819..19593c1 100644 --- a/centos8-build/Dockerfile +++ b/centos8-build/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" # Let package metadata expire after 60 seconds instead of 48 hours RUN echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile index 69eeb79..ccbef81f 100644 --- a/centos8-obs-latest/Dockerfile +++ b/centos8-obs-latest/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=almalinux:8 FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO_VERSION="latest" # Let package metadata expire after 60 seconds instead of 48 hours diff --git a/common/Release.key b/common/Release.key index 30aebe8..ecca084 100644 --- a/common/Release.key +++ b/common/Release.key @@ -1,20 +1,26 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.5 (GNU/Linux) -mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc -a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl -CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 -5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee -S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y -CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy -b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCYo5k -AwIbAwUJFGtcBwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fU7YI -AKtt2TSRJ6M+vJlAGEafD0OIwbLCQ5XY9xd0ncbW2HfsIznUafgRPgTz2YN5n1iO -hGAhAQVQrm7HIqZEJBmdvUHxiOgsVYviaVAo8t2fNH5TYdK4y5fjIjzNrFtJFr3z -ImxPmu/kuIhTCzl09Xd0vtIi7wDy1J0l5Chy4DR/X+NeduyvtgpbMCv8DX3G95GH -MHpsmFaFtKY0Mbuwu+aEZ97k/I1BkmPSDYFWycqe/fGYNRHjSQjopqD2+3sNyeAg -Bs7jPDnJ8RILRz7YnxMqT69z64mgrvlPj7jX2w8jdWKzhAythbbYDKOb7rYQ9U2g -NEpwNGuOkrZYSLlna1ZXYjiIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v -d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= -=wfqq +mQENBGKzE1QBCADFcM3ZzggvgxNRNNqDGWf5xIDAiK5qzFLdGes7L6F9VCHdaPy0 +RAOB5bFb/Q1tSDFNEBLtaauXKz+4iGL6qMVjZcyjzpB5w4jKN+kkrFRhjDNUv/SH +BX6d+P7v5WBGSNArNgA8D1BGzckp5a99EZ0okMJFEqIcN40PD6OGugpq5XnVV5Nk +e93fLa2Cu8vhFBcVn6CuHeEhsmuMf6NLbQRNfNNCEEUYaZn7beMYtpZ7t1djsKx5 +1xGm50OzI22FLu8lELQ9d7qMVGRG3WHYawX9BDteRybiyqxfwUHm1haWazRJtlGt +UWyzvwAb80BK1J2Nu5fbAa3w5CoEPAbUuCyrABEBAAG0JW9zbW9jb20gT0JTIFBy +b2plY3QgPG9zbW9jb21Ab3Ntb2NvbT6JAVQEEwEIAD4WIQRrKp83ktFetw1Oao+G +pzC2U3JZcwUCYrMV4wIbAwUJBB6yjwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK +CRCGpzC2U3JZc4FRCACQQkKIrnvQ7n2u7GSmyVZa3I+oLoFXSGqaGyey5TW/nrMm +vFDKU3qliHiuNSmUY35SnAhXUsvqOYppxVRoO1MLrqUvzMOnIWqkJpf8mtjGUnsW +jyVeto7Rsjs75y2i1Hk+e7ljb/V65J3NlfrfEYWbqR9AKd53ReNXTdrQ0J05A38N +GdI4Ld/2lNISAwaBmGhqdeKsLHpQw/JERU1TApVJR1whFiIwDF1rOCg9GPnNKIk7 +yRZdK267XzztrainX/cbPILyzUZEDhYs6wQuyACyQ1YUxZIxrwVfk7PMNay8CrLH +z42B73Ne5IAj8+op/3iJafFONLm7YXiDUFN+QDYAiQEzBBMBCAAdFiEExoiYhHND +S7aVYlnqa51NyAUyjdsFAmKzE1UACgkQa51NyAUyjdvuZgf+OXmr//i7u7Gg7eWB +7e0qUsyCId9lXS8J437x3K6ciJfD7/6RSy8TFW5Nglm/uSkbyq582I8t+SoOirMD +E6cg9U/5+h5s46bAf+Kd2XS/6tLGeNLM18i4el8CP06NpFzDrsKu76uYFpyRiiHD +otBdtgxeLJ83LugGfZslF+/5cigJkAJMhAdVvGO8h85R6fba8ZSOKtMKkaQRfi76 +nhyOrJPlLuS+DLEnHwdkOFgtKnxHdjM97K+Tx0gisb6uwaWroXfSLnhP8RTLLZZy +Z+noU1Hw3c+mn4c/NYbcC/uwHYHKRzuf9gHnQ3dGgv0Z5sbeLRVo92hjGj7Ftlyd +4hmKBg== +=HxK4 -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian-bullseye-build/Dockerfile b/debian-bullseye-build/Dockerfile index 3c8bf4b..b1e7cd5 100644 --- a/debian-bullseye-build/Dockerfile +++ b/debian-bullseye-build/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=debian:bullseye FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_11/" RUN apt-get update && \ diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile index 9c3d4f3..e7a584e 100644 --- a/debian-bullseye-erlang/Dockerfile +++ b/debian-bullseye-erlang/Dockerfile @@ -1,10 +1,8 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/debian:bullseye # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" - - +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_11/" # install the erlang vm and rebar (2) diff --git a/debian-bullseye-obs-latest/Dockerfile b/debian-bullseye-obs-latest/Dockerfile index 6707838..16320c0 100644 --- a/debian-bullseye-obs-latest/Dockerfile +++ b/debian-bullseye-obs-latest/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=debian:bullseye FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_11/" RUN apt-get update && \ diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 576041c..68c27ee 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -2,10 +2,8 @@ ARG UPSTREAM_DISTRO=debian:bullseye FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org" - - -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_11/" +ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_11/" RUN apt-get update && apt-get install -y \ ca-certificates \ diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 7000ca5..80e5678 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=debian:buster FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_10/" RUN apt-get update && \ diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 04c6c4c..5229373 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -5,8 +5,8 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/debian:${DEBIAN_VERSION} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" # Make "$DEBIAN_VERSION" available after FROM # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-fr… diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile index 71309b5..c697d16 100644 --- a/debian-buster-simtrace2/Dockerfile +++ b/debian-buster-simtrace2/Dockerfile @@ -1,10 +1,8 @@ ARG USER FROM $USER/debian-buster-build # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" - - +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_10/" COPY .common/Release.key /tmp/Release.key diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile index 011f5aa..da0eb9b 100644 --- a/debian-jessie-osmocom/Dockerfile +++ b/debian-jessie-osmocom/Dockerfile @@ -1,10 +1,8 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/debian:jessie # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" - - +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_8.0/" COPY .common/Release.key /tmp/Release.key diff --git a/debian-sid-jenkins/Dockerfile b/debian-sid-jenkins/Dockerfile index 944e514..bb66f13 100644 --- a/debian-sid-jenkins/Dockerfile +++ b/debian-sid-jenkins/Dockerfile @@ -5,8 +5,8 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/debian:${DEBIAN_VERSION} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" # Make "$DEBIAN_VERSION" available after FROM # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-fr… diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index b144e13..509e4d5 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=debian:stretch FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_9.0/" RUN apt-get update && \ diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index d44e394..42ed09a 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -5,8 +5,8 @@ ARG REGISTRY=docker.io FROM ${REGISTRY}/debian:${DEBIAN_VERSION} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" # Make "$DEBIAN_VERSION" available after FROM # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-fr… diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile index fe3420b..ced8a7d 100644 --- a/debian-stretch-obs-latest/Dockerfile +++ b/debian-stretch-obs-latest/Dockerfile @@ -2,8 +2,8 @@ ARG UPSTREAM_DISTRO=debian:stretch FROM ${REGISTRY}/${UPSTREAM_DISTRO} # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_9.0/" RUN apt-get update && \ diff --git a/make/Makefile b/make/Makefile index 89310dd..d3bd727 100644 --- a/make/Makefile +++ b/make/Makefile @@ -46,15 +46,15 @@ # Full OBS repository mirror consists of: # ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION} -# e.g. "https://download.opensuse.org/repositories/network:/osmocom:/latest/" +# e.g. "https://downloads.osmocom.org/packages/osmocom:/latest/" # # Use if down: OSMOCOM_REPO_MIRROR=http://ftp.uni-stuttgart.de/opensuse -OSMOCOM_REPO_MIRROR?=http://download.opensuse.org -OSMOCOM_REPO_PATH?=repositories/network:/osmocom: +OSMOCOM_REPO_MIRROR?=https://downloads.osmocom.org +OSMOCOM_REPO_PATH?=packages/osmocom: # Use "nightly" to use the nightly feed OSMOCOM_REPO_VERSION?=latest # Build the testsuite with the following mirror. In jenkins we always want to -# point this to http://download.opensuse.org, so the same testsuite can be +# point this to http://downloads.osmocom.org, so the same testsuite can be # used no matter which OSMOCOM_REPO_MIRROR is set. This avoids rebuilding the # testsuite when we only want to change OSMOCOM_REPO_MIRROR to build different # subjects under test, and it works even if the OSMOCOM_REPO_MIRROR only has diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile index 07c8551..a0bf9b9 100644 --- a/osmo-ran/Dockerfile +++ b/osmo-ran/Dockerfile @@ -2,8 +2,8 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO_VERSION=latest diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile index 03c16fe..b090d6c 100644 --- a/osmo-ran/split/ran-bsc_mgw/Dockerfile +++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile @@ -2,8 +2,8 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO_VERSION=latest diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile index 0129b75..19f68c4 100644 --- a/osmo-ran/split/ran-bts_pcu/Dockerfile +++ b/osmo-ran/split/ran-bts_pcu/Dockerfile @@ -2,8 +2,8 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO_VERSION=latest diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile index 467adab..0cd2713 100644 --- a/osmo-ran/split/ran-trx-ipc/Dockerfile +++ b/osmo-ran/split/ran-trx-ipc/Dockerfile @@ -2,8 +2,8 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO_VERSION=latest diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile index 3603685..75a596b 100644 --- a/osmo-ran/split/ran-trx-uhd/Dockerfile +++ b/osmo-ran/split/ran-trx-uhd/Dockerfile @@ -2,8 +2,8 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" +ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" +ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO_VERSION=latest -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I880f8134e4f7e6ae4125237e6b3983c04cea9ec6 Gerrit-Change-Number: 28417 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-ci[master]: jobs/osmocom-obs: run against obs.osmocom.org too

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28415 ) Change subject: jobs/osmocom-obs: run against obs.osmocom.org too ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > * This way it can't be forgotten when changing code that uses osc. […] I'd prefer any of the other possibilities you suggest. To me, the first bullet argument is more problematic than helping. I don't like having shared aliases because it hides stuff people won't be aware of imho. Let's see what others have to say. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib271e16e93ebc58ed1ecb0ea881e1f1370e40928 Gerrit-Change-Number: 28415 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, 27 Jun 2022 14:25:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ci[master]: jobs/osmocom-obs: run against obs.osmocom.org too

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28415 ) Change subject: jobs/osmocom-obs: run against obs.osmocom.org too ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > This looks a bit too dark. […] * This way it can't be forgotten when changing code that uses osc. It may work with one server that a developer is testing with, but then fail later on when we would need to use the other server. * I think using 'osc -A "$OBS_SERVER"' instead of 'osc' everywhere makes the code less readable. If you insist on not using alias, I'd rather put that into $OSC and call that. (But for the first reason I think alias is better.) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib271e16e93ebc58ed1ecb0ea881e1f1370e40928 Gerrit-Change-Number: 28415 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Jun 2022 14:06:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ci[master]: jobs/osmocom-obs: run against obs.osmocom.org too

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28415 ) Change subject: jobs/osmocom-obs: run against obs.osmocom.org too ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This looks a bit too dark. Why not passing server as a param instead of playing with alias and overwritting them? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib271e16e93ebc58ed1ecb0ea881e1f1370e40928 Gerrit-Change-Number: 28415 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, 27 Jun 2022 11:51:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: gsm_04_08_rr: ensure lchan info is present in all logging messages

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28414 ) Change subject: gsm_04_08_rr: ensure lchan info is present in all logging messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic34dd0fbefcd60d60fc8f98230f789c1bf134607 Gerrit-Change-Number: 28414 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Jun 2022 11:49:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ci[master]: jobs/osmocom-obs: run against obs.osmocom.org too

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28415 ) Change subject: jobs/osmocom-obs: run against obs.osmocom.org too ...................................................................... jobs/osmocom-obs: run against obs.osmocom.org too Split the OBS related jenkins jobs into two, one that uploads to the new obs.osmocom.org and one that uploads to build.opensuse.org. Set an alias for "osc" that sets the right server, and set the expand_aliases shopt so the bash scripts that source common-obs.sh will not ignore the alias. Related: OS#5557 Change-Id: Ib271e16e93ebc58ed1ecb0ea881e1f1370e40928 --- M jobs/osmocom-obs.yml M scripts/common-obs.sh 2 files changed, 22 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/15/28415/1 diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 3b8b1d8..cfd3bff 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -2,23 +2,24 @@ - project: name: Osmocom_OBS jobs: - - Osmocom_OBS_{type} + - Osmocom_OBS_{type}_{server} type: - nightly - latest # - next (disabled: OS#5322) + server: + - build.opensuse.org: + proj: "network:osmocom" + - obs.osmocom.org: + proj: "osmocom" - job-template: - name: 'Osmocom_OBS_{type}' + name: 'Osmocom_OBS_{type}_{server}' project-type: freestyle defaults: global description: | - <ul> - <li><a href="https://build.opensuse.org/project/show/network:osmocom:{type}">osmocom:{type} home page</a> - <li><a href="https://build.opensuse.org/project/monitor/network:osmocom:{type}">osmocom:{type} build monitor</a> - <li><a href="https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages">Wiki: binary packages</a> - </ul> - (Generated by job-builder) + See <a href="https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages">Wiki: binary packages</a> + for more information. node: obs parameters: - string: @@ -27,7 +28,9 @@ default: 'refs/remotes/origin/master' builders: - shell: | - export PROJ=network:osmocom:{type} + export PROJ={proj}:{type} + export OBS_SERVER={server} + ./scripts/osmocom-{type}-packages.sh scm: - git: diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh index 91d54c9..4de2c55 100644 --- a/scripts/common-obs.sh +++ b/scripts/common-obs.sh @@ -29,6 +29,16 @@ exit 1 fi +if [ -z "$OBS_SERVER" ]; then + echo "OBS_SERVER environment variable is not set" + exit 1 +fi + +# Related configuration sections are in .oscrc (OS#5557) +echo "Using OBS server: $OBS_SERVER" +shopt -s expand_aliases +alias osc="osc -A '$OBS_SERVER'" + # Add dependency to all (sub)packages in debian/control and commit the change. # $1: path to debian/control file # $2: package name (e.g. "libosmocore") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib271e16e93ebc58ed1ecb0ea881e1f1370e40928 Gerrit-Change-Number: 28415 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: gsm_04_08_rr: ensure lchan info is present in all logging messages

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28414 ) Change subject: gsm_04_08_rr: ensure lchan info is present in all logging messages ...................................................................... gsm_04_08_rr: ensure lchan info is present in all logging messages Change-Id: Ic34dd0fbefcd60d60fc8f98230f789c1bf134607 Related: OS#5572 --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/28414/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 761a801..13b00da 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -325,8 +325,9 @@ msgb_tlv_put(msg, GSM48_IE_CELL_SEL_IND_AFTER_REL, len, buf); } - DEBUGP(DRR, "Sending Channel Release: Chan: Number: %d Type: %d RR-Cause: 0x%x '%s'\n", - lchan->nr, lchan->type, lchan->release.rr_cause, rr_cause_name(lchan->release.rr_cause)); + DEBUGP(DRR, "%s Tx Channel Release (cause=0x%02x '%s')\n", + gsm_lchan_name(lchan), lchan->release.rr_cause, + rr_cause_name(lchan->release.rr_cause)); /* Send actual release request to MS */ return gsm48_sendmsg(msg); @@ -358,7 +359,8 @@ gh->proto_discr = GSM48_PDISC_RR; gh->msg_type = GSM48_MT_RR_CLSM_ENQ; - DEBUGP(DRR, "%s TX CLASSMARK ENQUIRY %u\n", gsm_lchan_name(lchan), msgb_length(msg)); + DEBUGP(DRR, "%s Tx CLASSMARK ENQUIRY (len=%u)\n", + gsm_lchan_name(lchan), msgb_length(msg)); return gsm48_sendmsg(msg); } @@ -372,7 +374,7 @@ msg->lchan = lchan; - DEBUGP(DRR, "TX CIPHERING MODE CMD\n"); + DEBUGP(DRR, "%s Tx CIPHERING MODE CMD\n", gsm_lchan_name(lchan)); if (lchan->encr.alg_a5_n > 0) ciph_mod_set = (lchan->encr.alg_a5_n - 1) << 1 | 0x01; @@ -619,7 +621,8 @@ (struct gsm48_ass_cmd *) msgb_put(msg, sizeof(*ass)); struct gsm_bts *bts = new_lchan->ts->trx->bts; - DEBUGP(DRR, "-> ASSIGNMENT COMMAND tch_mode=0x%02x\n", + DEBUGP(DRR, "%s Tx ASSIGNMENT COMMAND (tch_mode=0x%02x)\n", + gsm_lchan_name(current_lchan), new_lchan->current_ch_mode_rate.chan_mode); msg->lchan = current_lchan; @@ -709,7 +712,8 @@ (struct gsm48_chan_mode_modify *) msgb_put(msg, sizeof(*cmm)); struct gsm_bts *bts = lchan->ts->trx->bts; - DEBUGP(DRR, "-> CHANNEL MODE MODIFY mode=0x%02x\n", mode); + DEBUGP(DRR, "%s Tx CHANNEL MODE MODIFY (mode=0x%02x)\n", + gsm_lchan_name(lchan), mode); msg->lchan = lchan; gh->proto_discr = GSM48_PDISC_RR; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic34dd0fbefcd60d60fc8f98230f789c1bf134607 Gerrit-Change-Number: 28414 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmo-abis[master]: osmo_pcap_lapd_write: Fix write of uninitialized byte(s)

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28413 ) Change subject: osmo_pcap_lapd_write: Fix write of uninitialized byte(s) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I358c71354cc6ddad1964cc4a988ad29b7ba617f1 Gerrit-Change-Number: 28413 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 27 Jun 2022 08:21:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmo-abis[master]: osmo_pcap_lapd_write: Fix write of uninitialized byte(s)

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28413 ) Change subject: osmo_pcap_lapd_write: Fix write of uninitialized byte(s) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I358c71354cc6ddad1964cc4a988ad29b7ba617f1 Gerrit-Change-Number: 28413 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 27 Jun 2022 06:14:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022