Browse Source

Use Osmocom OBS

Related: OS#5557
Change-Id: I880f8134e4f7e6ae4125237e6b3983c04cea9ec6
changes/17/28417/1
Oliver Smith 2 months ago
parent
commit
30b32e574a
  1. 4
      README.md
  2. 4
      centos7-build/Dockerfile
  3. 4
      centos7-obs-latest/Dockerfile
  4. 4
      centos8-build/Dockerfile
  5. 4
      centos8-obs-latest/Dockerfile
  6. 38
      common/Release.key
  7. 4
      debian-bullseye-build/Dockerfile
  8. 6
      debian-bullseye-erlang/Dockerfile
  9. 4
      debian-bullseye-obs-latest/Dockerfile
  10. 6
      debian-bullseye-titan/Dockerfile
  11. 4
      debian-buster-build/Dockerfile
  12. 4
      debian-buster-jenkins/Dockerfile
  13. 6
      debian-buster-simtrace2/Dockerfile
  14. 6
      debian-jessie-osmocom/Dockerfile
  15. 4
      debian-sid-jenkins/Dockerfile
  16. 4
      debian-stretch-build/Dockerfile
  17. 4
      debian-stretch-jenkins/Dockerfile
  18. 4
      debian-stretch-obs-latest/Dockerfile
  19. 8
      make/Makefile
  20. 4
      osmo-ran/Dockerfile
  21. 4
      osmo-ran/split/ran-bsc_mgw/Dockerfile
  22. 4
      osmo-ran/split/ran-bts_pcu/Dockerfile
  23. 4
      osmo-ran/split/ran-trx-ipc/Dockerfile
  24. 4
      osmo-ran/split/ran-trx-uhd/Dockerfile

4
README.md

@ -45,7 +45,7 @@ $ ./jenkins.sh
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 @@ Environment variables:
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

4
centos7-build/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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

4
centos7-obs-latest/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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

4
centos8-build/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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

4
centos8-obs-latest/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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

38
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-----

4
debian-bullseye-build/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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 && \

6
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)

4
debian-bullseye-obs-latest/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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 && \

6
debian-bullseye-titan/Dockerfile

@ -2,10 +2,8 @@ ARG REGISTRY=docker.io
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 \

4
debian-buster-build/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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 && \

4
debian-buster-jenkins/Dockerfile

@ -5,8 +5,8 @@ ARG DEBIAN_VERSION=buster
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-from-interact

6
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

6
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

4
debian-sid-jenkins/Dockerfile

@ -5,8 +5,8 @@ ARG DEBIAN_VERSION=sid
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-from-interact

4
debian-stretch-build/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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 && \

4
debian-stretch-jenkins/Dockerfile

@ -5,8 +5,8 @@ ARG DEBIAN_VERSION=stretch
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-from-interact

4
debian-stretch-obs-latest/Dockerfile

@ -2,8 +2,8 @@ ARG REGISTRY=docker.io
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 && \

8
make/Makefile

@ -46,15 +46,15 @@ DISTRO?=debian-bullseye
# 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

4
osmo-ran/Dockerfile

@ -2,8 +2,8 @@ ARG USER
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

4
osmo-ran/split/ran-bsc_mgw/Dockerfile

@ -2,8 +2,8 @@ ARG USER
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

4
osmo-ran/split/ran-bts_pcu/Dockerfile

@ -2,8 +2,8 @@ ARG USER
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

4
osmo-ran/split/ran-trx-ipc/Dockerfile

@ -2,8 +2,8 @@ ARG USER
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

4
osmo-ran/split/ran-trx-uhd/Dockerfile

@ -2,8 +2,8 @@ ARG USER
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

Loading…
Cancel
Save