<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/24221">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-gsm-tester: Update srsLTE references to srsRAN<br><br>Change-Id: I58d4c26337382ad9e66a569a482e77442137383a<br>---<br>M osmo-gsm-tester/Dockerfile<br>M osmo-gsm-tester/jenkins.sh<br>M osmo-gsm-tester/osmo-gsm-tester-master.sh<br>3 files changed, 18 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile</span><br><span>index a69b5b2..a584faa 100644</span><br><span>--- a/osmo-gsm-tester/Dockerfile</span><br><span>+++ b/osmo-gsm-tester/Dockerfile</span><br><span>@@ -89,7 +89,7 @@</span><br><span> libasn1c-dev && \</span><br><span> apt-get clean</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# install srsLTE runtime dependencies</span><br><span style="color: hsl(120, 100%, 40%);">+# install srsRAN runtime dependencies</span><br><span> RUN apt-get update && \</span><br><span> apt-get install -y --no-install-recommends \</span><br><span> cmake \</span><br><span>diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh</span><br><span>index 05a6cde..85e6a69 100755</span><br><span>--- a/osmo-gsm-tester/jenkins.sh</span><br><span>+++ b/osmo-gsm-tester/jenkins.sh</span><br><span>@@ -10,10 +10,10 @@</span><br><span> # the host system (so that host's user ssh keys are potentially available) under</span><br><span> # /tmp/trial, and the inst is then later built inside the container.</span><br><span> # Several env vars are available to tweak where to fetch from.</span><br><span style="color: hsl(0, 100%, 40%);">-# SRS_LTE_BRANCH: The srsLTE.git branch to fetch.</span><br><span style="color: hsl(0, 100%, 40%);">-# SRS_LTE_REPO_PREFIX: The URL & prefix patch from where to clone the srsLTe.git</span><br><span style="color: hsl(120, 100%, 40%);">+# SRS_RAN_BRANCH: The srsRAN.git branch to fetch.</span><br><span style="color: hsl(120, 100%, 40%);">+# SRS_RAN_REPO_PREFIX: The URL & prefix patch from where to clone the srsRAN.git</span><br><span> # repo.</span><br><span style="color: hsl(0, 100%, 40%);">-# SRS_LTE_REPO_NAME: The srsLTE.git repo name, usually "srsLTE", but known to</span><br><span style="color: hsl(120, 100%, 40%);">+# SRS_RAN_REPO_NAME: The srsRAN.git repo name, usually "srsRAN", but known to</span><br><span> # have different names on some forks.</span><br><span> #</span><br><span> # osmo-gsm-tester parameters and suites are passed to osmo-gsm-tester.sh in same</span><br><span>@@ -25,16 +25,16 @@</span><br><span> </span><br><span> TRIAL_DIR="${TRIAL_DIR:-/tmp/trial}"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-SRS_LTE_BRANCH=${SRS_LTE_BRANCH:-master}</span><br><span style="color: hsl(0, 100%, 40%);">-SRS_LTE_REPO_PREFIX=${SRS_LTE_REPO_PREFIX:-git@github.com:srsLTE}</span><br><span style="color: hsl(0, 100%, 40%);">-SRS_LTE_REPO_NAME=${SRS_LTE_REPO_NAME:-srsLTE}</span><br><span style="color: hsl(120, 100%, 40%);">+SRS_RAN_BRANCH=${SRS_RAN_BRANCH:-master}</span><br><span style="color: hsl(120, 100%, 40%);">+SRS_RAN_REPO_PREFIX=${SRS_RAN_REPO_PREFIX:-git@github.com:srsran}</span><br><span style="color: hsl(120, 100%, 40%);">+SRS_RAN_REPO_NAME=${SRS_RAN_REPO_NAME:-srsRAN}</span><br><span> OPEN5GS_REPO_PREFIX=${OPEN5GS_REPO_PREFIX:-git@github.com:open5gs}</span><br><span> OPEN5GS_BRANCH=${OPEN5GS_BRANCH:-main}</span><br><span> have_repo() {</span><br><span> repo_prefix=$1</span><br><span> repo_name=$2</span><br><span> branch=$3</span><br><span style="color: hsl(0, 100%, 40%);">- echo "srsLTE inst not provided, fetching it now and it will be build in container"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "srsRAN inst not provided, fetching it now and it will be build in container"</span><br><span> if [ -d "${TRIAL_DIR}/${repo_name}" ]; then</span><br><span> git fetch -C ${TRIAL_DIR}/${repo_name}</span><br><span> else</span><br><span>@@ -51,12 +51,12 @@</span><br><span> rm -rf "${TRIAL_DIR:?}/${repo_name}/*"</span><br><span> git -C "${TRIAL_DIR}/${repo_name}" reset --hard "$branch"</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-# If srsLTE trial not provided by user, fetch srsLTE git repo and let the container build it:</span><br><span style="color: hsl(120, 100%, 40%);">+# If srsRAN trial not provided by user, fetch srsRAN git repo and let the container build it:</span><br><span> if [ "x$(ls ${TRIAL_DIR}/srslte.*.tgz 2>/dev/null | wc -l)" = "x0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- have_repo $SRS_LTE_REPO_PREFIX $SRS_LTE_REPO_NAME $SRS_LTE_BRANCH</span><br><span style="color: hsl(120, 100%, 40%);">+ have_repo $SRS_RAN_REPO_PREFIX $SRS_RAN_REPO_NAME $SRS_RAN_BRANCH</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# If open5gs trial not provided by user, fetch srsLTE git repo and let the container build it:</span><br><span style="color: hsl(120, 100%, 40%);">+# If open5gs trial not provided by user, fetch srsRAN git repo and let the container build it:</span><br><span> if [ "x$(ls ${TRIAL_DIR}/open5gs.*.tgz 2>/dev/null | wc -l)" = "x0" ]; then</span><br><span> have_repo $OPEN5GS_REPO_PREFIX "open5gs" $OPEN5GS_BRANCH</span><br><span> have_repo "https://github.com/open5gs" "freeDiameter" "r1.5.0"</span><br><span>@@ -108,7 +108,7 @@</span><br><span> -v "${TRIAL_DIR}:/tmp/trial" \</span><br><span> -e "OSMO_GSM_TESTER_CONF=${OSMO_GSM_TESTER_CONF}" \</span><br><span> -e "OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS}" \</span><br><span style="color: hsl(0, 100%, 40%);">- -e "SRS_LTE_REPO_NAME=${SRS_LTE_REPO_NAME}" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "SRS_RAN_REPO_NAME=${SRS_RAN_REPO_NAME}" \</span><br><span> -e "HOST_USER_ID=$(id -u)" \</span><br><span> -e "HOST_GROUP_ID=$(id -g)" \</span><br><span> --name ${BUILD_TAG}-ogt-master \</span><br><span>diff --git a/osmo-gsm-tester/osmo-gsm-tester-master.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>index ae300c9..ca8d58f 100755</span><br><span>--- a/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>+++ b/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>@@ -11,10 +11,10 @@</span><br><span> ip addr add 172.18.50.9/24 dev eth0</span><br><span> ip addr add 172.18.50.10/24 dev eth0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-build_srslte() {</span><br><span style="color: hsl(0, 100%, 40%);">- git_repo_dir="/tmp/trial/${SRS_LTE_REPO_NAME}"</span><br><span style="color: hsl(120, 100%, 40%);">+build_srsran() {</span><br><span style="color: hsl(120, 100%, 40%);">+ git_repo_dir="/tmp/trial/${SRS_RAN_REPO_NAME}"</span><br><span> if [ ! -d "$git_repo_dir" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "No external trial nor git repo provided for srsLTE!"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "No external trial nor git repo provided for srsRAN!"</span><br><span> exit 1</span><br><span> fi</span><br><span> pushd "/tmp/trial"</span><br><span>@@ -26,6 +26,7 @@</span><br><span> set +x; echo; echo; set -x</span><br><span> make install</span><br><span> cd ..</span><br><span style="color: hsl(120, 100%, 40%);">+ # REMARK: OGT still uses old naming "srslte" for the trial.</span><br><span> this="srslte.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"</span><br><span> tar="${this}.tgz"</span><br><span> tar czf "/tmp/trial/$tar" -C "/tmp/trial/sysroot" .</span><br><span>@@ -58,9 +59,9 @@</span><br><span> popd</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Build srsLTE.git if not provided by host system:</span><br><span style="color: hsl(120, 100%, 40%);">+# Build srsRAN.git if not provided by host system:</span><br><span> if [ "x$(ls /tmp/trial/srslte.*.tgz 2>/dev/null | wc -l)" = "x0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- build_srslte</span><br><span style="color: hsl(120, 100%, 40%);">+ build_srsran</span><br><span> fi</span><br><span> </span><br><span> # Build open5gs.git if not provided by host system:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/24221">change 24221</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/24221"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I58d4c26337382ad9e66a569a482e77442137383a </div>
<div style="display:none"> Gerrit-Change-Number: 24221 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>