Change in osmo-ci[master]: docker_images_require: add symlink code path

[osmith]

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16870 )

Change subject: docker_images_require: add symlink code path
......................................................................

docker_images_require: add symlink code path

Make development easier by skipping fetch, checkout and reset --hard if
_docker_playground is a symlink. Document _docker_playground in
README.adoc and explain how to set up the symlink.

Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846
---
M README.adoc
M scripts/common.sh
2 files changed, 27 insertions(+), 10 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  osmith: Verified



diff --git a/README.adoc b/README.adoc
index aa45b58..786be0d 100644
--- a/README.adoc
+++ b/README.adoc
@@ -12,3 +12,14 @@
 scripts: used by jenkins jobs. Various osmo*/contrib/jenkins.sh scripts assume
 osmo-ci to be checked out in the build slave user's home, i.e. using a PATH of
 $HOME/osmo-ci/scripts.
+
+_docker_playground: Clone of docker-playground.git, so the scripts can build
+required docker images. This dir gets created on demand by scripts/common.sh,
+and automatically fetched and reset to "origin/master" (override with
+$OSMO_BRANCH_DOCKER_PLAYGROUND). The fetch and reset gets skipped if
+_docker_playground is a symlink. For development, set it up as follows:
+
+ $ git clone https://git.osmocom.org/docker-playground
+ $ git clone https://git.osmocom.org/osmo-ci
+ $ cd osmo-ci
+ $ ln -s ../docker-playground _docker_playground
diff --git a/scripts/common.sh b/scripts/common.sh
index 6d28cfc..340bac8 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -117,18 +117,24 @@
 docker_images_require() {
 	local oldpwd="$PWD"
 
-	# Get docker-plaground.git
-	if [ -d "_docker_playground" ]; then
-		git -C _docker_playground fetch
+	if [ -L "_docker_playground" ]; then
+		echo "NOTE: _docker_playground is a symlink, skipping fetch, checkout, reset"
+		cd "_docker_playground/$1"
 	else
-		git clone https://git.osmocom.org/docker-playground/ _docker_playground
-	fi
-	cd _docker_playground
-	git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND"
-	git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND"
+		# Get docker-plaground.git
+		if [ -d "_docker_playground" ]; then
+			git -C _docker_playground fetch
+		else
+			git clone https://git.osmocom.org/docker-playground/ _docker_playground
+		fi
 
-	# jenkins-common.sh expects to run from a subdir in docker-playground.git
-	cd "$1"
+		cd _docker_playground
+		git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND"
+		git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND"
+
+		# jenkins-common.sh expects to run from a subdir in docker-playground.git
+		cd "$1"
+	fi
 
 	# Subshell: run docker_images_require from jenkins-common.sh, pass all arguments
 	(. ../jenkins-common.sh; docker_images_require "$@")

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16870
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846
Gerrit-Change-Number: 16870
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200116/37d567f7/attachment.htm>