osmocom
/
docker-playground
mirror of https://gerrit.osmocom.org/docker-playground
10
0
Fork 0
Code Releases Activity

jenkins-common.sh: add image_suffix_is_latest 

Make sure we run the latest-code paths for "latest-centos8" too.

Change-Id: Ibcc7dfb092b3766ef9b189ae990b43fdb746a022
This commit is contained in:
Oliver Smith 2021-05-20 14:29:11 +02:00
parent 9f9782a702
commit 4ae6ba75b4
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins-common.sh
View File

@ -335,6 +335,14 @@ kernel_test_wait_for_vm() {
exit 1
}
# Check if IMAGE_SUFFIX starts with "latest" (e.g. "latest-centos8")
image_suffix_is_latest() {
case "$IMAGE_SUFFIX" in
latest*) return 0 ;;
*) return 1 ;;
esac
}
set -x
# non-jenkins execution: assume local user name

2
ttcn3-pcu-test/jenkins.sh
View File

@ -17,7 +17,7 @@ mkdir $VOL_BASE_DIR/pcu-tester/unix
cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/
# Disable until osmo-pcu release > 0.9.0
if [ "$IMAGE_SUFFIX" = "latest" ]; then
if image_suffix_is_latest; then
sed -i "s/^PCUIF_Components.mp_send_all_data_ind.*/PCUIF_Components.mp_send_all_data_ind := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg
fi

2
ttcn3-sgsn-test/jenkins.sh
View File

@ -25,7 +25,7 @@ cp osmo-stp.cfg $VOL_BASE_DIR/stp/
mkdir $VOL_BASE_DIR/unix
# Disable until osmo-sgsn.git release > 1.7.0 is available
if [ "$IMAGE_SUFFIX" = "latest" ]; then
if image_suffix_is_latest; then
sed "/mme test-mme0/d" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg
sed "/gtp remote-ip/d" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg
sed "/gtp ran-info-relay/d" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg

2
ttcn3-stp-test/jenkins.sh
View File

@ -16,7 +16,7 @@ mkdir $VOL_BASE_DIR/stp
cp osmo-stp.cfg $VOL_BASE_DIR/stp/
# Disable until osmo-stp release > 1.4.0
if [ "$IMAGE_SUFFIX" = "latest" ]; then
if image_suffix_is_latest; then
sed -i "s/^STP_Tests_M3UA.mp_stp_has_asp_quirk.*/STP_Tests_M3UA.mp_stp_has_asp_quirk := false;/" $VOL_BASE_DIR/stp-tester/STP_Tests.cfg
fi