summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-03-28 14:30:28 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-04-08 15:43:19 +0200
commit3531a192ae8eeb78c53342454f65327bce4fa57a (patch)
tree2791d8927038eb0e3ffc8c4371955051161a6a5d /contrib
parentdae3d3c47906379061d57854fd140e8a7a12a25c (diff)
core implementation
code bomb implementing the bulk of the osmo-gsm-tester Change-Id: I53610becbf643ed51b90cfd9debc6992fe211ec9
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/jenkins-openbsc-build.sh8
-rwxr-xr-xcontrib/jenkins-osmo-bts-octphy.sh2
-rwxr-xr-xcontrib/jenkins-osmo-bts-sysmo.sh7
-rwxr-xr-xcontrib/jenkins-osmo-bts-trx.sh4
4 files changed, 10 insertions, 11 deletions
diff --git a/contrib/jenkins-openbsc-build.sh b/contrib/jenkins-openbsc-build.sh
index e242927..f2be853 100755
--- a/contrib/jenkins-openbsc-build.sh
+++ b/contrib/jenkins-openbsc-build.sh
@@ -18,9 +18,9 @@ osmo_gsm_tester_host=root@10.9.1.190
osmo_gsm_tester_dir="/var/tmp/osmo-gsm-tester"
tmp_dir="/var/tmp/prep-osmo-gsm-tester"
arch="x86_64"
-archive_name="openbsc-$arch-build-$BUILD_NUMBER"
+archive_name="openbsc.$arch-build-$BUILD_NUMBER"
archive="$archive_name.tgz"
-manifest="manifest.txt"
+manifest="checksums.md5"
test_report="test-report.xml"
test_timeout_sec=120
@@ -78,7 +78,9 @@ rm -rf "$local_ts_base" || true
mkdir -p "$local_ts_dir"
# create archive of openbsc build
-tar czf "$local_ts_dir/$archive" "$prefix_dirname"/*
+cd "$prefix_dirname"
+tar czf "../$local_ts_dir/$archive" *
+cd ..
# move archived bts builds into test session directory
mv $WORKSPACE/osmo-bts-*.tgz "$local_ts_dir"
cd "$local_ts_dir"
diff --git a/contrib/jenkins-osmo-bts-octphy.sh b/contrib/jenkins-osmo-bts-octphy.sh
index a966083..0a5a88c 100755
--- a/contrib/jenkins-osmo-bts-octphy.sh
+++ b/contrib/jenkins-osmo-bts-octphy.sh
@@ -91,4 +91,4 @@ main "$octbts_repos"
# build the archive that is going to be copied to the tester and then to the BTS
rm -f $WORKSPACE/osmo-bts-octphy*.tgz
-tar czf $WORKSPACE/osmo-bts-octphy-build-$BUILD_NUMBER.tgz inst-osmo-bts-octphy
+tar czf $WORKSPACE/osmo-bts-octphy.build-$BUILD_NUMBER.tgz inst-osmo-bts-octphy
diff --git a/contrib/jenkins-osmo-bts-sysmo.sh b/contrib/jenkins-osmo-bts-sysmo.sh
index 142eddd..6edb7d3 100755
--- a/contrib/jenkins-osmo-bts-sysmo.sh
+++ b/contrib/jenkins-osmo-bts-sysmo.sh
@@ -60,9 +60,6 @@ for dep in $deps; do
done
# build the archive that is going to be copied to the tester and then to the BTS
-tar_name="osmo-bts-sysmo-build-"
-if ls "$base/$tar_name"* ; then
- rm -f "$base/$tar_name"*
-fi
+rm -f "$base/osmo-bts-sysmo.*.tgz"
cd "$prefix_base_real"
-tar cvzf "$base/$tar_name${BUILD_NUMBER}.tgz" *
+tar cvzf "$base/osmo-bts-sysmo.build-${BUILD_NUMBER}.tgz" *
diff --git a/contrib/jenkins-osmo-bts-trx.sh b/contrib/jenkins-osmo-bts-trx.sh
index b2b215b..713f974 100755
--- a/contrib/jenkins-osmo-bts-trx.sh
+++ b/contrib/jenkins-osmo-bts-trx.sh
@@ -56,6 +56,6 @@ for dep in $deps; do
done
# build the archive that is going to be copied to the tester
+rm -f "$base/osmo-bts-trx*.tgz"
cd "$base"
-rm -f osmo-bts-trx*.tgz
-tar czf "osmo-bts-trx-build-${BUILD_NUMBER}.tgz" "$inst"
+tar czf "osmo-bts-trx.build-${BUILD_NUMBER}.tgz" "$inst"