osmo-gsm-tester: Update srsLTE references to srsRAN

Change-Id: I58d4c26337382ad9e66a569a482e77442137383a

3 files changed, 18 insertions, 17 deletions

diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile
index a69b5b2..a584faa 100644
--- a/osmo-gsm-tester/Dockerfile
+++ b/osmo-gsm-tester/Dockerfile
@@ -89,7 +89,7 @@ RUN	apt-get update && \
 		libasn1c-dev && \
 	apt-get clean
 
-# install srsLTE runtime dependencies
+# install srsRAN runtime dependencies
 RUN	apt-get update && \
 	apt-get install -y --no-install-recommends \
 		cmake \
diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh
index 05a6cde..85e6a69 100755
--- a/osmo-gsm-tester/jenkins.sh
+++ b/osmo-gsm-tester/jenkins.sh
@@ -10,10 +10,10 @@
 # the host system (so that host's user ssh keys are potentially available) under
 # /tmp/trial, and the inst is then later built inside the container.
 # Several env vars are available to tweak where to fetch from.
-# SRS_LTE_BRANCH: The srsLTE.git branch to fetch.
-# SRS_LTE_REPO_PREFIX: The URL & prefix patch from where to clone the srsLTe.git
+# SRS_RAN_BRANCH: The srsRAN.git branch to fetch.
+# SRS_RAN_REPO_PREFIX: The URL & prefix patch from where to clone the srsRAN.git
 #                      repo.
-# SRS_LTE_REPO_NAME: The srsLTE.git repo name, usually "srsLTE", but known to
+# SRS_RAN_REPO_NAME: The srsRAN.git repo name, usually "srsRAN", but known to
 #                    have different names on some forks.
 #
 # osmo-gsm-tester parameters and suites are passed to osmo-gsm-tester.sh in same
@@ -25,16 +25,16 @@
 
 TRIAL_DIR="${TRIAL_DIR:-/tmp/trial}"
 
-SRS_LTE_BRANCH=${SRS_LTE_BRANCH:-master}
-SRS_LTE_REPO_PREFIX=${SRS_LTE_REPO_PREFIX:-git@github.com:srsLTE}
-SRS_LTE_REPO_NAME=${SRS_LTE_REPO_NAME:-srsLTE}
+SRS_RAN_BRANCH=${SRS_RAN_BRANCH:-master}
+SRS_RAN_REPO_PREFIX=${SRS_RAN_REPO_PREFIX:-git@github.com:srsran}
+SRS_RAN_REPO_NAME=${SRS_RAN_REPO_NAME:-srsRAN}
 OPEN5GS_REPO_PREFIX=${OPEN5GS_REPO_PREFIX:-git@github.com:open5gs}
 OPEN5GS_BRANCH=${OPEN5GS_BRANCH:-main}
 have_repo() {
 	repo_prefix=$1
 	repo_name=$2
 	branch=$3
-	echo "srsLTE inst not provided, fetching it now and it will be build in container"
+	echo "srsRAN inst not provided, fetching it now and it will be build in container"
 	if [ -d "${TRIAL_DIR}/${repo_name}" ]; then
 		git fetch -C ${TRIAL_DIR}/${repo_name}
 	else
@@ -51,12 +51,12 @@ have_repo() {
 	rm -rf "${TRIAL_DIR:?}/${repo_name}/*"
 	git -C "${TRIAL_DIR}/${repo_name}" reset --hard "$branch"
 }
-# If srsLTE trial not provided by user, fetch srsLTE git repo and let the container build it:
+# If srsRAN trial not provided by user, fetch srsRAN git repo and let the container build it:
 if [ "x$(ls ${TRIAL_DIR}/srslte.*.tgz 2>/dev/null | wc -l)" = "x0" ]; then
-	have_repo  $SRS_LTE_REPO_PREFIX $SRS_LTE_REPO_NAME $SRS_LTE_BRANCH
+	have_repo  $SRS_RAN_REPO_PREFIX $SRS_RAN_REPO_NAME $SRS_RAN_BRANCH
 fi
 
-# If open5gs trial not provided by user, fetch srsLTE git repo and let the container build it:
+# If open5gs trial not provided by user, fetch srsRAN git repo and let the container build it:
 if [ "x$(ls ${TRIAL_DIR}/open5gs.*.tgz 2>/dev/null | wc -l)" = "x0" ]; then
 	have_repo $OPEN5GS_REPO_PREFIX "open5gs" $OPEN5GS_BRANCH
 	have_repo "https://github.com/open5gs" "freeDiameter" "r1.5.0"
@@ -108,7 +108,7 @@ docker run	--rm \
 		-v "${TRIAL_DIR}:/tmp/trial" \
 		-e "OSMO_GSM_TESTER_CONF=${OSMO_GSM_TESTER_CONF}" \
 		-e "OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS}" \
-		-e "SRS_LTE_REPO_NAME=${SRS_LTE_REPO_NAME}" \
+		-e "SRS_RAN_REPO_NAME=${SRS_RAN_REPO_NAME}" \
 		-e "HOST_USER_ID=$(id -u)" \
 		-e "HOST_GROUP_ID=$(id -g)" \
 		--name ${BUILD_TAG}-ogt-master \
diff --git a/osmo-gsm-tester/osmo-gsm-tester-master.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh
index ae300c9..ca8d58f 100755
--- a/osmo-gsm-tester/osmo-gsm-tester-master.sh
+++ b/osmo-gsm-tester/osmo-gsm-tester-master.sh
@@ -11,10 +11,10 @@ ip addr add 172.18.50.8/24 dev eth0
 ip addr add 172.18.50.9/24 dev eth0
 ip addr add 172.18.50.10/24 dev eth0
 
-build_srslte() {
-        git_repo_dir="/tmp/trial/${SRS_LTE_REPO_NAME}"
+build_srsran() {
+        git_repo_dir="/tmp/trial/${SRS_RAN_REPO_NAME}"
         if [ ! -d "$git_repo_dir" ]; then
-                echo "No external trial nor git repo provided for srsLTE!"
+                echo "No external trial nor git repo provided for srsRAN!"
                 exit 1
         fi
         pushd "/tmp/trial"
@@ -26,6 +26,7 @@ build_srslte() {
         set +x; echo; echo; set -x
         make install
         cd ..
+        # REMARK: OGT still uses old naming "srslte" for the trial.
         this="srslte.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"
         tar="${this}.tgz"
         tar czf "/tmp/trial/$tar" -C "/tmp/trial/sysroot" .
@@ -58,9 +59,9 @@ build_open5gs() {
         popd
 }
 
-# Build srsLTE.git if not provided by host system:
+# Build srsRAN.git if not provided by host system:
 if [ "x$(ls /tmp/trial/srslte.*.tgz 2>/dev/null | wc -l)" = "x0" ]; then
-        build_srslte
+        build_srsran
 fi
 
 # Build open5gs.git if not provided by host system: