diff --git a/jenkins/setup-opm-tests.sh b/jenkins/setup-opm-tests.sh index 79654773d..65dc58cce 100755 --- a/jenkins/setup-opm-tests.sh +++ b/jenkins/setup-opm-tests.sh @@ -33,7 +33,7 @@ else then cp $OPM_TESTS_ROOT $WORKSPACE/deps/opm-tests -R pushd $WORKSPACE/deps/opm-tests - echo "opmt-tests-revision: `git rev-parse HEAD`" + echo "opm-tests-revision: `git rev-parse HEAD`" popd fi fi diff --git a/jenkins/update-opm-tests.sh b/jenkins/update-opm-tests.sh index 1317e9a02..cc1acb3aa 100755 --- a/jenkins/update-opm-tests.sh +++ b/jenkins/update-opm-tests.sh @@ -22,6 +22,7 @@ upstreamRev[opm-grid]=master upstreamRev[opm-models]=master upstreamRev[opm-simulators]=master upstreamRev[opm-upscaling]=master +upstreamRev[opm-tests]=master # Setup revision tables parseRevisions @@ -43,6 +44,12 @@ done # Do the commit export REASON +if [ "${upstreamRev[opm-tests]}" == "master" ] +then + export BRANCH_BASE=origin/master +else + export BRANCH_BASE=${upstreamRev[opm-tests]} +fi export BRANCH_NAME $WORKSPACE/deps/opm-simulators/tests/update_reference_data.sh $OPM_TESTS_ROOT $WORKSPACE/$configuration/build-opm-simulators $WORKSPACE/$configuration/install/bin/convertECL if test $? -eq 5