Merge branch 'master' into arehbein/devtests
Change-Id: I9eda5f88bfde40d1e9862a6f1172ae16ee2bb0dd
This commit is contained in:
arehbein
commit
c1cd7ec259
|
|
@ -1,4 +1,4 @@
|
|||
FROM gerritcodereview/gerrit:3.4.5
|
||||
FROM gerritcodereview/gerrit:3.4.8
|
||||
|
||||
USER root
|
||||
RUN yum -y install zip unzip patch
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
ARG REGISTRY=docker.io
|
||||
FROM ${REGISTRY}/debian:buster
|
||||
FROM ${REGISTRY}/debian:bullseye
|
||||
|
||||
|
||||
RUN apt-get update && \
|
||||
|
|
@ -7,14 +7,14 @@ RUN apt-get update && \
|
|||
ca-certificates \
|
||||
gnupg
|
||||
|
||||
ADD https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_10/Release.key /tmp/Release.key
|
||||
ADD https://pgp.mongodb.com/server-4.2.asc /tmp/server-4.2.asc
|
||||
ADD https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_11/Release.key /tmp/Release.key
|
||||
ADD https://pgp.mongodb.com/server-5.0.asc /tmp/server-5.0.asc
|
||||
|
||||
RUN echo "deb http://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_10/ ./" \
|
||||
RUN echo "deb http://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_11/ ./" \
|
||||
> /etc/apt/sources.list.d/open5gs.list
|
||||
RUN echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" \
|
||||
RUN echo "deb http://repo.mongodb.org/apt/debian bullseye/mongodb-org/5.0 main" \
|
||||
> /etc/apt/sources.list.d/mongodb-org.list
|
||||
RUN apt-key add /tmp/Release.key && apt-key add /tmp/server-4.2.asc
|
||||
RUN apt-key add /tmp/Release.key && apt-key add /tmp/server-5.0.asc
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y \
|
||||
|
|
|
|||
|
|
@ -160,8 +160,8 @@ WORKDIR /tmp
|
|||
|
||||
ARG OSMO_GSM_TESTER_BRANCH="master"
|
||||
|
||||
RUN git clone git://git.osmocom.org/osmo-gsm-tester.git
|
||||
ADD http://git.osmocom.org/osmo-gsm-tester/patch?h=$OSMO_GSM_TESTER_BRANCH /tmp/commit
|
||||
RUN git clone https://gerrit.osmocom.org/osmo-gsm-tester.git
|
||||
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-tester/+/$OSMO_GSM_TESTER_BRANCH?format=TEXT /tmp/commit
|
||||
|
||||
RUN cd osmo-gsm-tester && \
|
||||
git fetch && git checkout $OSMO_GSM_TESTER_BRANCH && \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
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 \
|
||||
|
|
@ -31,6 +32,7 @@ RUN apt-get update && \
|
|||
libgtpnl-dev \
|
||||
liblimesuite-dev \
|
||||
libncurses5-dev \
|
||||
libnl-route-3-dev \
|
||||
liboping-dev \
|
||||
liborcania-dev \
|
||||
libortp-dev \
|
||||
|
|
@ -40,7 +42,6 @@ RUN apt-get update && \
|
|||
libosmo-mgcp-client-dev \
|
||||
libosmo-netif-dev \
|
||||
libosmo-ranap-dev \
|
||||
libnl-route-3-dev \
|
||||
libosmo-rua-dev \
|
||||
libosmo-sccp-dev \
|
||||
libosmo-sigtran-dev \
|
||||
|
|
@ -67,6 +68,10 @@ RUN apt-get update && \
|
|||
make \
|
||||
mscgen \
|
||||
python3-nwdiag \
|
||||
rsync \
|
||||
xsltproc \
|
||||
&& \
|
||||
apt-get clean
|
||||
|
||||
RUN useradd --uid=${UID} -m user
|
||||
USER user
|
||||
|
|
|
|||
|
|
@ -8,21 +8,13 @@ docker_images_require \
|
|||
docker run \
|
||||
--rm=true \
|
||||
-v "$PWD:/build" \
|
||||
-v "$(readlink -f $SSH_AUTH_SOCK)":/ssh-agent \
|
||||
-w /osmo-ci \
|
||||
-e KEEP_TEMP="$KEEP_TEMP" \
|
||||
-e SSH_AUTH_SOCK=/ssh-agent \
|
||||
"$USER/release-tarball-build-dist" sh -e /build/osmocom-release-tarballs.sh
|
||||
|
||||
if [ -z "$WORKSPACE" ]; then
|
||||
set +x
|
||||
echo "NOTE: not running on jenkins, skipping upload"
|
||||
fi
|
||||
|
||||
cat > "$WORKSPACE/known_hosts" <<EOF
|
||||
[ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
|
||||
[ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
|
||||
[ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
|
||||
EOF
|
||||
|
||||
SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"
|
||||
cd _release_tarballs
|
||||
rsync -avz --delete -e "$SSH_COMMAND" . releases@ftp.osmocom.org:web-files/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
# Environment variables:
|
||||
# * KEEP_TEMP: do not delete cloned repositories (use for development)
|
||||
# * PARALLEL_MAKE: -jN argument for make (default: -j5).
|
||||
SSH_COMMAND="ssh -o UserKnownHostsFile=/build/known_hosts -p 48"
|
||||
OSMO_GIT_URL="https://git.osmocom.org"
|
||||
OSMO_RELEASE_REPOS="
|
||||
libasn1c
|
||||
|
|
@ -190,6 +191,15 @@ remove_temp_dir() {
|
|||
fi
|
||||
}
|
||||
|
||||
get_existing_tarballs() {
|
||||
if ! $SSH_COMMAND releases@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)
|
||||
|
|
@ -315,10 +325,22 @@ create_move_tarball() {
|
|||
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)"
|
||||
|
|
@ -336,7 +358,10 @@ for repo in $OSMO_RELEASE_REPOS; do
|
|||
echo " $tarball (ignored)"
|
||||
continue
|
||||
elif [ -e "$OUTPUT/$repo/$tarball" ]; then
|
||||
echo " $tarball (exists)"
|
||||
echo " $tarball (exists locally)"
|
||||
continue
|
||||
elif grep -q "^web-files/$repo/$tarball$" "$TEMP"/existing_tarballs; then
|
||||
echo " $tarball (exists on server)"
|
||||
continue
|
||||
fi
|
||||
|
||||
|
|
@ -346,4 +371,5 @@ for repo in $OSMO_RELEASE_REPOS; do
|
|||
done
|
||||
|
||||
remove_temp_dir
|
||||
upload
|
||||
echo "done!"
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ ListenOn = "172.18.3.201";
|
|||
# Default : NO DEFAULT
|
||||
#TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>";
|
||||
#TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key";
|
||||
TLS_Cred = "/etc/freeDiameter/smf.cert.pem", "/etc/freeDiameter/smf.key.pem";
|
||||
|
||||
# Certificate authority / trust anchors
|
||||
# The file containing the list of trusted Certificate Authorities (PEM list)
|
||||
|
|
@ -114,7 +113,6 @@ TLS_Cred = "/etc/freeDiameter/smf.cert.pem", "/etc/freeDiameter/smf.key.pem";
|
|||
# The directive can appear several times to specify several files.
|
||||
# Default : GNUTLS default behavior
|
||||
#TLS_CA = "<file.PEM>";
|
||||
TLS_CA = "/etc/freeDiameter/cacert.pem";
|
||||
|
||||
# Certificate Revocation List file
|
||||
# The information about revoked certificates.
|
||||
|
|
|
|||
|
|
@ -109,6 +109,13 @@ logger:
|
|||
# gtpu:
|
||||
# name: localhost
|
||||
#
|
||||
# <Metrics Server>
|
||||
#
|
||||
# o Metrics Server(http://<any address>:9090)
|
||||
# metrics:
|
||||
# addr: 0.0.0.0
|
||||
# port: 9090
|
||||
#
|
||||
# <Subnet for UE Pool>
|
||||
#
|
||||
# o IPv4 Pool
|
||||
|
|
@ -342,6 +349,9 @@ smf:
|
|||
port: 2152
|
||||
option:
|
||||
so_bindtodevice: eth0
|
||||
metrics:
|
||||
addr: 172.18.3.201
|
||||
port: 9090
|
||||
subnet:
|
||||
- addr: 176.16.16.1/20
|
||||
dnn: internet
|
||||
|
|
@ -351,7 +361,6 @@ smf:
|
|||
dnn: inet46
|
||||
- addr: 2001:780:44:2100:0:0:0:1/56
|
||||
dnn: inet46
|
||||
|
||||
dns:
|
||||
- 172.18.3.222
|
||||
- 8.8.8.8
|
||||
|
|
@ -533,17 +542,3 @@ pool:
|
|||
# handover:
|
||||
# duration: 500
|
||||
time:
|
||||
|
||||
#
|
||||
# metrics:
|
||||
#
|
||||
# <Metrics Server>
|
||||
#
|
||||
# o Metrics Server(http://<any address>:9090)
|
||||
# metrics:
|
||||
# addr: 0.0.0.0
|
||||
# port: 9090
|
||||
#
|
||||
metrics:
|
||||
addr: 172.18.3.201
|
||||
port: 9090
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ ListenOn = "172.18.18.4";
|
|||
# Default : NO DEFAULT
|
||||
#TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>";
|
||||
#TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key";
|
||||
TLS_Cred = "/etc/freeDiameter/smf.cert.pem", "/etc/freeDiameter/smf.key.pem";
|
||||
|
||||
# Certificate authority / trust anchors
|
||||
# The file containing the list of trusted Certificate Authorities (PEM list)
|
||||
|
|
@ -114,7 +113,6 @@ TLS_Cred = "/etc/freeDiameter/smf.cert.pem", "/etc/freeDiameter/smf.key.pem";
|
|||
# The directive can appear several times to specify several files.
|
||||
# Default : GNUTLS default behavior
|
||||
#TLS_CA = "<file.PEM>";
|
||||
TLS_CA = "/etc/freeDiameter/cacert.pem";
|
||||
|
||||
# Certificate Revocation List file
|
||||
# The information about revoked certificates.
|
||||
|
|
|
|||
|
|
@ -109,6 +109,13 @@ logger:
|
|||
# gtpu:
|
||||
# name: localhost
|
||||
#
|
||||
# <Metrics Server>
|
||||
#
|
||||
# o Metrics Server(http://<any address>:9090)
|
||||
# metrics:
|
||||
# addr: 0.0.0.0
|
||||
# port: 9090
|
||||
#
|
||||
# <Subnet for UE Pool>
|
||||
#
|
||||
# o IPv4 Pool
|
||||
|
|
@ -337,6 +344,9 @@ smf:
|
|||
- addr: 172.18.18.4
|
||||
gtpu:
|
||||
- addr: 172.18.18.4
|
||||
metrics:
|
||||
addr: 172.18.18.4
|
||||
port: 9090
|
||||
subnet:
|
||||
- addr: 10.45.0.1/16
|
||||
dnn: internet
|
||||
|
|
@ -521,17 +531,3 @@ pool:
|
|||
# handover:
|
||||
# duration: 500
|
||||
time:
|
||||
|
||||
#
|
||||
# metrics:
|
||||
#
|
||||
# <Metrics Server>
|
||||
#
|
||||
# o Metrics Server(http://<any address>:9090)
|
||||
# metrics:
|
||||
# addr: 0.0.0.0
|
||||
# port: 9090
|
||||
#
|
||||
metrics:
|
||||
addr: 172.18.18.4
|
||||
port: 9090
|
||||
|
|
|
|||
Loading…
Reference in New Issue