mirror of https://gerrit.osmocom.org/osmo-ci
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
This commit is contained in:
parent
51e91cd9bb
commit
d0418d0f92
11
README.adoc
11
README.adoc
|
@ -12,3 +12,14 @@ for more information about deployment.
|
||||||
scripts: used by jenkins jobs. Various osmo*/contrib/jenkins.sh scripts assume
|
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
|
osmo-ci to be checked out in the build slave user's home, i.e. using a PATH of
|
||||||
$HOME/osmo-ci/scripts.
|
$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
|
||||||
|
|
|
@ -117,18 +117,24 @@ osmo_source_subdir() {
|
||||||
docker_images_require() {
|
docker_images_require() {
|
||||||
local oldpwd="$PWD"
|
local oldpwd="$PWD"
|
||||||
|
|
||||||
# Get docker-plaground.git
|
if [ -L "_docker_playground" ]; then
|
||||||
if [ -d "_docker_playground" ]; then
|
echo "NOTE: _docker_playground is a symlink, skipping fetch, checkout, reset"
|
||||||
git -C _docker_playground fetch
|
cd "_docker_playground/$1"
|
||||||
else
|
else
|
||||||
git clone https://git.osmocom.org/docker-playground/ _docker_playground
|
# Get docker-plaground.git
|
||||||
fi
|
if [ -d "_docker_playground" ]; then
|
||||||
cd _docker_playground
|
git -C _docker_playground fetch
|
||||||
git checkout "$OSMO_BRANCH_DOCKER_PLAYGROUND"
|
else
|
||||||
git reset --hard "origin/$OSMO_BRANCH_DOCKER_PLAYGROUND"
|
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 _docker_playground
|
||||||
cd "$1"
|
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
|
# Subshell: run docker_images_require from jenkins-common.sh, pass all arguments
|
||||||
(. ../jenkins-common.sh; docker_images_require "$@")
|
(. ../jenkins-common.sh; docker_images_require "$@")
|
||||||
|
|
Loading…
Reference in New Issue