osmith has submitted this change. ( 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(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
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-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
Attention is currently required from: laforge.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28417 )
Change subject: Use Osmocom OBS
......................................................................
Patch Set 1: Code-Review+2
(2 comments)
Patchset:
PS1:
> LGTM, but we should of course only deploy it once the nightly jenkins job is deployed, i.e. […]
ACK. It's deployed and packages built today, merging now.
PS1:
1+1=2
--
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-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-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 28 Jun 2022 14:08:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28429 )
Change subject: cbsp: Change log level ERROR->INFO on CBSP tx and link down
......................................................................
cbsp: Change log level ERROR->INFO on CBSP tx and link down
Let's decrease the logging since it's fine simply discarding the message
if the link is down. This way all code sending messages doesn't need to
care about the link state.
Change-Id: I64356ec6a7b3a4e11a0e66b17efab2788b1ca5cc
---
M src/osmo-bsc/cbsp_link.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/28429/1
diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c
index d8c32ec..849b802 100644
--- a/src/osmo-bsc/cbsp_link.c
+++ b/src/osmo-bsc/cbsp_link.c
@@ -301,7 +301,7 @@
struct msgb *msg;
if (!cbc->client.cli && !cbc->server.srv) {
- LOGP(DCBS, LOGL_ERROR, "Discarding Tx CBSP Message Type %s, link is down\n",
+ LOGP(DCBS, LOGL_INFO, "Discarding Tx CBSP Message Type %s, link is down\n",
get_value_string(cbsp_msg_type_names, cbsp->msg_type));
talloc_free(cbsp);
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28429
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I64356ec6a7b3a4e11a0e66b17efab2788b1ca5cc
Gerrit-Change-Number: 28429
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/28427 )
Change subject: sigtran: Use caps in section header
......................................................................
sigtran: Use caps in section header
Change-Id: Ie7ff0dced649a29817a5a46e37eaaaf7ee22aea6
---
M common/chapters/sigtran.adoc
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/27/28427/1
diff --git a/common/chapters/sigtran.adoc b/common/chapters/sigtran.adoc
index 58445bb..2cbd84c 100644
--- a/common/chapters/sigtran.adoc
+++ b/common/chapters/sigtran.adoc
@@ -380,7 +380,7 @@
Osmocom (libosmo-sigtran) implements both the SGP and ASP roles, but not
the IPSP role.
-==== traffic modes in SIGTRAN
+==== Traffic Modes in SIGTRAN
Whenever an AS consists of multiple ASPs, the traffic mode expresses how
messages are distributed between those ASPs.
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/28427
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: Ie7ff0dced649a29817a5a46e37eaaaf7ee22aea6
Gerrit-Change-Number: 28427
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange