OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #645 from akva2/add_shared_opm_data

Browse Source 
Use shared copy of opm-data when possible
This commit is contained in:
Atgeirr Flø Rasmussen 2016-04-12 14:38:40 +02:00
commit 391bda4711
4 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins/build-opm-simulators.sh
View File

@ -58,11 +58,14 @@ function build_opm_simulators {
clone_and_build_module opm-output "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install" $OPM_OUTPUT_REVISION $WORKSPACE/serial clone_and_build_module opm-output "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install" $OPM_OUTPUT_REVISION $WORKSPACE/serial
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
# Setup opm-data
source $WORKSPACE/deps/opm-common/jenkins/setup-opm-data.sh
# Build opm-simulators # Build opm-simulators
pushd . pushd .
mkdir serial/build-opm-simulators mkdir serial/build-opm-simulators
cd serial/build-opm-simulators cd serial/build-opm-simulators
build_module "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install" 1 $WORKSPACE build_module "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DOPM_DATA_ROOT=$OPM_DATA_ROOT" 1 $WORKSPACE
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
popd popd
} }

12
jenkins/run-norne.sh
View File

@ -1,17 +1,5 @@
#!/bin/bash #!/bin/bash
# Clone opm-data if necessary
if ! test -d deps/opm-data
then
OPM_DATA_REVISION="master"
if grep -q "opm-data=" <<< $ghprbCommentBody
then
OPM_DATA_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-data=([0-9]+).*/\1/g'`/merge
fi
source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh
clone_module opm-data $OPM_DATA_REVISION
fi
pushd . pushd .
cd deps/opm-data cd deps/opm-data

13
jenkins/run-polymer.sh
View File

@ -1,18 +1,5 @@
#!/bin/bash #!/bin/bash
# Clone opm-data if necessary
if ! test -d deps/opm-data
then
OPM_DATA_REVISION="master"
if grep -q "opm-data=" <<< $ghprbCommentBody
then
OPM_DATA_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-data=([0-9]+).*/\1/g'`/merge
fi
source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh
echo "grabbing opm-data rev $OPM_DATA_REVISION"
clone_module opm-data $OPM_DATA_REVISION
fi
pushd . pushd .
cd deps/opm-data cd deps/opm-data

12
jenkins/run-spe.sh
View File

@ -1,17 +1,5 @@
#!/bin/bash #!/bin/bash
# Clone opm-data if necessary
if ! test -d deps/opm-data
then
OPM_DATA_REVISION="master"
if grep -q "opm-data=" <<< $ghprbCommentBody
then
OPM_DATA_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-data=([0-9]+).*/\1/g'`/merge
fi
source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh
clone_module opm-data $OPM_DATA_REVISION
fi
pushd . pushd .
cd deps/opm-data cd deps/opm-data