[MERGED] osmo-gsm-tester[master]: checkout dependencies from script

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Mon May 15 12:23:58 UTC 2017


Neels Hofmeyr has submitted this change and it was merged.

Change subject: checkout dependencies from script
......................................................................


checkout dependencies from script

The jenkins jobs used to have multiple source repositories configured, but it
is really cumbersome to add all the SCM links to a jenkins job.

Instead, clone the git sources from the script, as we also do in various other
contrib/ scripts.

This partly duplicates the osmo-ci scripts, but since this code is much more
intended to run on other peoples' jenkins instances, rather keep the osmo-ci
dependency out of here.

Change-Id: Ie05cb9cd2bd884f72cbdbcc96d9c4389ffca7357
---
M contrib/jenkins-osmo-bts-octphy.sh
M contrib/jenkins-osmo-bts-sysmo.sh
M contrib/jenkins-osmo-bts-trx.sh
M contrib/jenkins-osmo-nitb.sh
4 files changed, 21 insertions(+), 20 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins-osmo-bts-octphy.sh b/contrib/jenkins-osmo-bts-octphy.sh
index 49560ca..a4a57e4 100755
--- a/contrib/jenkins-osmo-bts-octphy.sh
+++ b/contrib/jenkins-osmo-bts-octphy.sh
@@ -15,14 +15,14 @@
 have_repo() {
 	repo="$1"
 	cd "$base"
-	if [ ! -e "$repo" ]; then
-		set +x
-		echo "MISSING REPOSITORY: $repo"
-		echo "should be provided by the jenkins workspace"
-		exit 1
+	if [ ! -d "$repo" ]; then
+		git clone "git://git.osmocom.org/$repo" "$repo"
 	fi
 	cd "$repo"
 	git clean -dxf
+	git fetch origin
+	git reset --hard origin/master
+	git rev-parse HEAD
 	cd "$base"
 }
 
diff --git a/contrib/jenkins-osmo-bts-sysmo.sh b/contrib/jenkins-osmo-bts-sysmo.sh
index 52f7593..5e6c9d9 100755
--- a/contrib/jenkins-osmo-bts-sysmo.sh
+++ b/contrib/jenkins-osmo-bts-sysmo.sh
@@ -13,14 +13,14 @@
 have_repo() {
 	repo="$1"
 	cd "$base"
-	if [ ! -e "$repo" ]; then
-		set +x
-		echo "MISSING REPOSITORY: $repo"
-		echo "should be provided by the jenkins workspace"
-		exit 1
+	if [ ! -d "$repo" ]; then
+		git clone "git://git.osmocom.org/$repo" "$repo"
 	fi
 	cd "$repo"
 	git clean -dxf
+	git fetch origin
+	git reset --hard origin/master
+	git rev-parse HEAD
 	cd "$base"
 }
 
diff --git a/contrib/jenkins-osmo-bts-trx.sh b/contrib/jenkins-osmo-bts-trx.sh
index e44cf0a..fb49a75 100755
--- a/contrib/jenkins-osmo-bts-trx.sh
+++ b/contrib/jenkins-osmo-bts-trx.sh
@@ -16,14 +16,14 @@
 have_repo() {
 	repo="$1"
 	cd "$base"
-	if [ ! -e "$repo" ]; then
-		set +x
-		echo "MISSING REPOSITORY: $repo"
-		echo "should be provided by the jenkins workspace"
-		exit 1
+	if [ ! -d "$repo" ]; then
+		git clone "git://git.osmocom.org/$repo" "$repo"
 	fi
 	cd "$repo"
 	git clean -dxf
+	git fetch origin
+	git reset --hard origin/master
+	git rev-parse HEAD
 	cd "$base"
 }
 
diff --git a/contrib/jenkins-osmo-nitb.sh b/contrib/jenkins-osmo-nitb.sh
index 05d2041..61d6e2f 100755
--- a/contrib/jenkins-osmo-nitb.sh
+++ b/contrib/jenkins-osmo-nitb.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 set -e -x
 
 base="$PWD"
@@ -18,14 +19,14 @@
 have_repo() {
 	repo="$1"
 	cd "$base"
-	if [ ! -e "$repo" ]; then
-		set +x
-		echo "MISSING REPOSITORY: $repo"
-		echo "should be provided by the jenkins workspace"
-		exit 1
+	if [ ! -d "$repo" ]; then
+		git clone "git://git.osmocom.org/$repo" "$repo"
 	fi
 	cd "$repo"
 	git clean -dxf
+	git fetch origin
+	git reset --hard origin/master
+	git rev-parse HEAD
 	cd "$base"
 }
 

-- 
To view, visit https://gerrit.osmocom.org/2601
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie05cb9cd2bd884f72cbdbcc96d9c4389ffca7357
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>



More information about the gerrit-log mailing list