From 93b8d26f865e87055fc318559b318376c4c8175a Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 3 Aug 2018 10:07:06 +0200 Subject: [PATCH] fixed: allow using update_data with a opm-tests PR the update_data command needs a full opm-tests checkout, not just a shallow clone of the PR branch. we thus first copy the shared copy, then we pull the PR branch into that copy. --- jenkins/setup-opm-tests.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jenkins/setup-opm-tests.sh b/jenkins/setup-opm-tests.sh index 1e4110772..387578820 100755 --- a/jenkins/setup-opm-tests.sh +++ b/jenkins/setup-opm-tests.sh @@ -16,9 +16,14 @@ then cp $OPM_TESTS_ROOT_PREDEFINED $WORKSPACE/deps/opm-tests -R fi else - # Specified in trigger, download it - source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh - clone_module opm-tests $OPM_TESTS_REVISION + # We need a full repo checkout + cp $OPM_TESTS_ROOT_PREDEFINED $WORKSPACE/deps/opm-tests -R + pushd $WORKSPACE/deps/opm-tests + # Then we fetch the PR branch + git remote add PR https://github.com/OPM/opm-tests + git fetch --depth 1 PR $OPM_TESTS_REVISION:branch_to_build + git checkout branch_to_build + popd fi else if ! test -d $WORKSPACE/deps/opm-tests