From b02c21115d1f2c76aa134ce7447998e9b26cc0b7 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sun, 9 Apr 2017 18:46:48 +0200 Subject: wip Change-Id: Icce6bd83173db86a64fa621e641131758380c7cd --- contrib/jenkins-remote-update.sh | 2 +- contrib/jenkins-run.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/jenkins-remote-update.sh b/contrib/jenkins-remote-update.sh index 3b4fc74..f30855e 100755 --- a/contrib/jenkins-remote-update.sh +++ b/contrib/jenkins-remote-update.sh @@ -17,7 +17,7 @@ if ssh "$osmo_gsm_tester_host" "test -d \"$osmo_gsm_tester_src\"" ; then echo "$status" exit 1 fi - ssh "$osmo_gsm_tester_host" "cd \"$osmo_gsm_tester_src\"; git clean -fdx; git pull" + ssh "$osmo_gsm_tester_host" "cd \"$osmo_gsm_tester_src\"; git clean -fdx; git fetch; git reset --hard origin/master" else osmo_gsm_tester_src_dirname="$(dirname "$osmo_gsm_tester_src")" ssh "$osmo_gsm_tester_host" "git clone git://git.osmocom.org/osmo-gsm-tester.git \"$osmo_gsm_tester_src\"" diff --git a/contrib/jenkins-run.sh b/contrib/jenkins-run.sh index 62394d1..b0b4925 100755 --- a/contrib/jenkins-run.sh +++ b/contrib/jenkins-run.sh @@ -11,7 +11,8 @@ osmo_gsm_tester_src="${OSMO_GSM_TESTER_REMOTE_SRC:-/usr/local/src/osmo-gsm-teste osmo_gsm_tester_dir="/var/tmp/osmo-gsm-tester" tmp_dir="/var/tmp/prep-osmo-gsm-tester" -trial_name="$NODE_NAME-$BUILD_TAG" +#trial_name="$NODE_NAME-$BUILD_TAG" +trial_name="trial-$BUILD_NUMBER" local_trial_base="./compose_trial" local_trial_dir="$local_trial_base/$trial_name" @@ -33,4 +34,4 @@ scp -r "$local_trial_dir" $osmo_gsm_tester_host:$tmp_dir/ ssh "$osmo_gsm_tester_host" "mv $tmp_dir/$trial_name $osmo_gsm_tester_dir" trial_dir="$osmo_gsm_tester_dir/$trial_name" -ssh "$osmo_gsm_tester_host" "$osmo_gsm_tester_src/src/osmo-gsm-tester.py $trial_dir" +ssh "$osmo_gsm_tester_host" "$osmo_gsm_tester_src/src/osmo-gsm-tester.py $trial_dir -T" -- cgit v1.2.3