osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29772 )
Change subject: contrib/jenkins.sh: run …rebuild.sh from workspace ......................................................................
contrib/jenkins.sh: run …rebuild.sh from workspace
After cloning a repository, go back into the workspace directory. Run scripts/osmo-ci-docker-rebuild.sh from there, instead of the version cloned into ~/osmo-ci. This is the behavior one would expect.
Without this patch, a _docker_playground temporary git clone gets created/used in ~/osmo-ci, although it would make much more sense to have it in the workspace dir.
Change-Id: I998c0d47ee5ce6f9978d1a6c9e195d5ce40e4e85 --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/72/29772/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 300d38c..6512af9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,6 @@ #!/bin/sh set -e -x +WORKSPACE_DIR="$(realpath "$(dirname "$0")/..")"
# Clone repository to ~/, or update existing # $1: name of osmocom project @@ -12,12 +13,13 @@
git rev-parse HEAD git status + + cd "$WORKSPACE_DIR" }
clone_repo osmo-ci clone_repo osmo-gsm-manuals
if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" != "x1" ]; then - cd ~/osmo-ci scripts/osmo-ci-docker-rebuild.sh fi
-
osmith