From aca26242732f258b24e48adb66816684902e941e Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 11 May 2017 17:39:02 +0200 Subject: paths: have one common parent dir /var/tmp/osmo-gsm-tester In the example config and the jenkins scripts, use paths below common parent dir /var/tmp/osmo-gsm-tester. 1. example: put the state dir in /var/tmp/osmo-gsm-tester/state, instead of in the config dir like /etc/osmo-gsm-tester. 2. contrib scripts: place trials in /var/tmp/osmo-gsm-tester/trials, and to move into place atomically, use /var/tmp/osmo-gsm-tester/.prep-trials as temporary location. The OsmoGSMTester manual is currently also being updated to setup these paths, with /var/tmp/osmo-gsm-tester owned by a common group and having group-sticky as well has group-writable access rules. Change-Id: I2961e9d1d9b14859b886058b54ffcb36f4d88bc1 --- contrib/jenkins-run.sh | 4 ++-- contrib/trials-cleanup.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/jenkins-run.sh b/contrib/jenkins-run.sh index e82f562..7d796b5 100755 --- a/contrib/jenkins-run.sh +++ b/contrib/jenkins-run.sh @@ -8,8 +8,8 @@ fi osmo_gsm_tester_host="$OSMO_GSM_TESTER_REMOTE_MAIN_UNIT" osmo_gsm_tester_src="${OSMO_GSM_TESTER_REMOTE_SRC:-/usr/local/src/osmo-gsm-tester}" -osmo_gsm_tester_dir="/var/tmp/osmo-gsm-tester" -tmp_dir="/var/tmp/prep-osmo-gsm-tester" +osmo_gsm_tester_dir="/var/tmp/osmo-gsm-tester/trials" +tmp_dir="/var/tmp/osmo-gsm-tester/.prep-trials" #trial_name="$NODE_NAME-$BUILD_TAG" trial_name="trial-$BUILD_NUMBER" diff --git a/contrib/trials-cleanup.sh b/contrib/trials-cleanup.sh index baf9c2b..830f4e7 100755 --- a/contrib/trials-cleanup.sh +++ b/contrib/trials-cleanup.sh @@ -4,10 +4,10 @@ trial_rx_dir="$1" trial_prep_dir="$2" if [ -z "$trial_rx_dir" ]; then - trial_rx_dir="/var/tmp/osmo-gsm-tester" + trial_rx_dir="/var/tmp/osmo-gsm-tester/trials" fi if [ -z "$trial_prep_dir" ]; then - trial_prep_dir="/var/tmp/prep-osmo-gsm-tester" + trial_prep_dir="/var/tmp/osmo-gsm-tester/.prep-trials" fi mkdir -p "$trial_prep_dir" -- cgit v1.2.3