diff --git a/jenkins/build.sh b/jenkins/build.sh index 733ded103..d13cbf3c3 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -23,14 +23,15 @@ downstreamRev[opm-upscaling]=master # Clone opm-common if ! test -d $WORKSPACE/deps/opm-common then - mkdir -p $WORKSPACE/deps/opm-common - pushd $WORKSPACE/deps/opm-common - git init . - git remote add origin https://github.com/OPM/opm-common - git fetch --depth 1 origin ${upstreamRev[opm-common]}:branch_to_build - test $? -eq 0 || exit 1 - git checkout branch_to_build - popd + mkdir -p $WORKSPACE/deps/opm-common + pushd $WORKSPACE/deps/opm-common + repo_root=${OPM_REPO_ROOT:-https://github.com/OPM} + git init . + git remote add origin ${repo_root}/opm-common + git fetch --depth 1 origin ${upstreamRev[opm-common]}:branch_to_build + test $? -eq 0 || exit 1 + git checkout branch_to_build + popd fi source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh @@ -43,7 +44,7 @@ clone_repositories opm-grid # Setup opm-data if grep -q "with downstreams" <<< $ghprbCommentBody then - source $WORKSPACE/deps/opm-common/jenkins/setup-opm-tests.sh + source $WORKSPACE/deps/opm-common/jenkins/setup-opm-tests.sh fi build_module_full opm-grid diff --git a/jenkins/static_analysis.sh b/jenkins/static_analysis.sh index 10e7738b6..052c76e96 100755 --- a/jenkins/static_analysis.sh +++ b/jenkins/static_analysis.sh @@ -14,8 +14,9 @@ fi # Clone opm-common mkdir -p $WORKSPACE/deps/opm-common pushd $WORKSPACE/deps/opm-common +repo_root=${OPM_REPO_ROOT:-https://github.com/OPM} git init . -git remote add origin https://github.com/OPM/opm-common +git remote add origin ${repo_root}/opm-common git fetch --depth 1 origin ${upstreamRev[opm-common]}:branch_to_build test $? -eq 0 || exit 1 git checkout branch_to_build