osmith has uploaded this change for review.
open5gs configs: duplicate cfgs for latest/master
The config format just changed significantly in main/master. Duplicate
the configs, so we can run latest with the old versions.
Related: OS#6267
Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2
---
M ttcn3-ggsn-test/jenkins-ogs.sh
R ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml
C ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
R ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml
C ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
M ttcn3-hss-test-ogs/jenkins.sh
R ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml
C ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
M ttcn3-mme-test-ogs/jenkins.sh
R ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml
C ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
M ttcn3-pgw-test/jenkins.sh
R ttcn3-pgw-test/open5gs-nrf-latest.yaml
C ttcn3-pgw-test/open5gs-nrf-master.yaml
R ttcn3-pgw-test/open5gs-smf-latest.yaml
C ttcn3-pgw-test/open5gs-smf-master.yaml
R ttcn3-pgw-test/open5gs-upf-latest.yaml
C ttcn3-pgw-test/open5gs-upf-master.yaml
18 files changed, 27 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/04/35104/1
diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh
index 5875b75..07952bc 100755
--- a/ttcn3-ggsn-test/jenkins-ogs.sh
+++ b/ttcn3-ggsn-test/jenkins-ogs.sh
@@ -16,7 +16,7 @@
write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg"
mkdir $VOL_BASE_DIR/ggsn
-cp ogs/open5gs-*.yaml $VOL_BASE_DIR/ggsn/
+cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/ggsn/
cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/
cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/
cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/
@@ -35,9 +35,9 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1"
- #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1"
- #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1"
+ /bin/sh -c "open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1"
docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
@@ -49,7 +49,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 222) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml >/data/open5gs-upfd.out 2>&1"
+ /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf-$IMAGE_SUFFIX.yaml >/data/open5gs-upfd.out 2>&1"
# start docker container with testsuite in foreground
docker run --rm \
diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/open5gs-smf.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml
diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
similarity index 100%
copy from ttcn3-ggsn-test/ogs/open5gs-smf.yaml
copy to ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/open5gs-upf.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml
diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
similarity index 100%
copy from ttcn3-ggsn-test/ogs/open5gs-upf.yaml
copy to ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh
index 0eacaf9..eb60835 100755
--- a/ttcn3-hss-test-ogs/jenkins.sh
+++ b/ttcn3-hss-test-ogs/jenkins.sh
@@ -18,7 +18,7 @@
write_mp_osmo_repo "$VOL_BASE_DIR/hss-tester/HSS_Tests.cfg"
mkdir $VOL_BASE_DIR/hss
-cp ogs/open5gs-*.yaml $VOL_BASE_DIR/hss/
+cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/hss/
cp ogs/freediameter.conf $VOL_BASE_DIR/hss/
network_create
@@ -64,7 +64,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-hssd -c /data/open5gs-hss.yaml >/data/open5gs-hssd.out 2>&1"
+ /bin/sh -c "open5gs-hssd -c /data/open5gs-hss-$IMAGE_SUFFIX.yaml >/data/open5gs-hssd.out 2>&1"
# start docker container with testsuite in foreground
docker run --rm \
diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml
similarity index 100%
rename from ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml
rename to ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml
diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
similarity index 100%
copy from ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml
copy to ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
diff --git a/ttcn3-mme-test-ogs/jenkins.sh b/ttcn3-mme-test-ogs/jenkins.sh
index 164123a..069b990 100755
--- a/ttcn3-mme-test-ogs/jenkins.sh
+++ b/ttcn3-mme-test-ogs/jenkins.sh
@@ -15,7 +15,7 @@
write_mp_osmo_repo "$VOL_BASE_DIR/mme-tester/MME_Tests.cfg"
mkdir $VOL_BASE_DIR/mme
-cp ogs/open5gs-*.yaml $VOL_BASE_DIR/mme/
+cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/mme/
cp ogs/freediameter.conf $VOL_BASE_DIR/mme/
cp ogs/mme.sh $VOL_BASE_DIR/mme/
@@ -31,7 +31,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-mmed -c /data/open5gs-mme.yaml >/data/open5gs-mmed.out 2>&1"
+ /bin/sh -c "open5gs-mmed -c /data/open5gs-mme-$IMAGE_SUFFIX.yaml >/data/open5gs-mmed.out 2>&1"
# start docker container with testsuite in foreground
docker run --rm \
diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml
similarity index 100%
rename from ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml
rename to ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml
diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
similarity index 100%
copy from ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml
copy to ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index 8311bac..3e10a13 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -15,7 +15,7 @@
mkdir $VOL_BASE_DIR/pgw
cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/
-cp open5gs-*.yaml $VOL_BASE_DIR/pgw/
+cp open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/pgw/
cp upfd.sh $VOL_BASE_DIR/pgw/
cp upfd-setup.sh $VOL_BASE_DIR/pgw/
@@ -33,7 +33,7 @@
--name ${BUILD_TAG}-nrf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-nrfd -c /data/open5gs-nrf.yaml >/data/open5gs-nrf.out 2>&1"
+ /bin/sh -c "open5gs-nrfd -c /data/open5gs-nrf-$IMAGE_SUFFIX.yaml >/data/open5gs-nrf.out 2>&1"
# start container with open5gs-upfd in background
docker run --cap-add=NET_ADMIN \
@@ -46,7 +46,7 @@
--name ${BUILD_TAG}-upf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml >/data/open5gs-upfd.out 2>&1"
+ /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf-$IMAGE_SUFFIX.yaml >/data/open5gs-upfd.out 2>&1"
# start container with open5gs-smfd in background
docker run --cap-add=NET_ADMIN \
@@ -59,8 +59,8 @@
--name ${BUILD_TAG}-smf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1"
- #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1"
+ /bin/sh -c "open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1"
# start container with osmo-ugcups-daemon in background; SYS_ADMIN required for CLONE_NEWNS
docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \
diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf-latest.yaml
similarity index 100%
rename from ttcn3-pgw-test/open5gs-nrf.yaml
rename to ttcn3-pgw-test/open5gs-nrf-latest.yaml
diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf-master.yaml
similarity index 100%
copy from ttcn3-pgw-test/open5gs-nrf.yaml
copy to ttcn3-pgw-test/open5gs-nrf-master.yaml
diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf-latest.yaml
similarity index 100%
rename from ttcn3-pgw-test/open5gs-smf.yaml
rename to ttcn3-pgw-test/open5gs-smf-latest.yaml
diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf-master.yaml
similarity index 100%
copy from ttcn3-pgw-test/open5gs-smf.yaml
copy to ttcn3-pgw-test/open5gs-smf-master.yaml
diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf-latest.yaml
similarity index 100%
rename from ttcn3-pgw-test/open5gs-upf.yaml
rename to ttcn3-pgw-test/open5gs-upf-latest.yaml
diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf-master.yaml
similarity index 100%
copy from ttcn3-pgw-test/open5gs-upf.yaml
copy to ttcn3-pgw-test/open5gs-upf-master.yaml
To view, visit change 35104. To unsubscribe, or for help writing mail filters, visit settings.