OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added: tell update_data where to start branch from

Browse Source 
this to allow for update_data from opm-tests
This commit is contained in:
Arne Morten Kvarving 2021-11-12 11:58:21 +01:00
parent 40df72bc95
commit f7375c2638
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/setup-opm-tests.sh
View File

@ -33,7 +33,7 @@ else
then then
cp $OPM_TESTS_ROOT $WORKSPACE/deps/opm-tests -R cp $OPM_TESTS_ROOT $WORKSPACE/deps/opm-tests -R
pushd $WORKSPACE/deps/opm-tests pushd $WORKSPACE/deps/opm-tests
echo "opmt-tests-revision: `git rev-parse HEAD`" echo "opm-tests-revision: `git rev-parse HEAD`"
popd popd
fi fi
fi fi

7
jenkins/update-opm-tests.sh
View File

@ -22,6 +22,7 @@ upstreamRev[opm-grid]=master
upstreamRev[opm-models]=master upstreamRev[opm-models]=master
upstreamRev[opm-simulators]=master upstreamRev[opm-simulators]=master
upstreamRev[opm-upscaling]=master upstreamRev[opm-upscaling]=master
upstreamRev[opm-tests]=master
# Setup revision tables # Setup revision tables
parseRevisions parseRevisions
@ -43,6 +44,12 @@ done
# Do the commit # Do the commit
export REASON export REASON
if [ "${upstreamRev[opm-tests]}" == "master" ]
then
export BRANCH_BASE=origin/master
else
export BRANCH_BASE=${upstreamRev[opm-tests]}
fi
export BRANCH_NAME 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 $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 if test $? -eq 5