From 596561b4ce07f2e4561465aec4aebc61ef53fa0c Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 11 Apr 2016 12:16:21 +0200
Subject: [PATCH] Use shared copy of opm-data when possible

- The user can supply OPM_DATA_ROOT directly and this
is used.
- The user can supply OPM_DATA_ROOT_PREDEFINED and
this is used unless there is a PR against opm-data specified in the
trigger.

This is used to minimize the network traffic on the jenkins resource.
opm-data is updated nightly, and this nightly updated copy is used
unless otherwise instructed.

This commit also enables the opm-data integration tests on all runs.
---
 jenkins/build-opm-simulators.sh |  5 ++++-
 jenkins/run-norne.sh            | 12 ------------
 jenkins/run-polymer.sh          | 13 -------------
 jenkins/run-spe.sh              | 12 ------------
 4 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/jenkins/build-opm-simulators.sh b/jenkins/build-opm-simulators.sh
index 690846835..128345fab 100755
--- a/jenkins/build-opm-simulators.sh
+++ b/jenkins/build-opm-simulators.sh
@@ -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
   test $? -eq 0 || exit 1
 
+  # Setup opm-data
+  source $WORKSPACE/deps/opm-common/jenkins/setup-opm-data.sh
+
   # Build opm-simulators
   pushd .
   mkdir 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
   popd
 }
diff --git a/jenkins/run-norne.sh b/jenkins/run-norne.sh
index b8073d774..2da4288a2 100755
--- a/jenkins/run-norne.sh
+++ b/jenkins/run-norne.sh
@@ -1,17 +1,5 @@
 #!/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 .
 cd deps/opm-data
 
diff --git a/jenkins/run-polymer.sh b/jenkins/run-polymer.sh
index 1fd99aead..f82ccec5c 100755
--- a/jenkins/run-polymer.sh
+++ b/jenkins/run-polymer.sh
@@ -1,18 +1,5 @@
 #!/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 .
 cd deps/opm-data
 
diff --git a/jenkins/run-spe.sh b/jenkins/run-spe.sh
index 084da551b..48074cfb0 100755
--- a/jenkins/run-spe.sh
+++ b/jenkins/run-spe.sh
@@ -1,17 +1,5 @@
 #!/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 .
 cd deps/opm-data