From 8175a0eea26a70de52d9bd1b6c09e87f3055c959 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 22 Aug 2016 14:33:29 +0200
Subject: [PATCH] simplify jenkins build scripts after ert reorganization

---
 jenkins/build-opm-upscaling.sh | 21 ++-------------------
 jenkins/build-pr.sh            | 12 ++++--------
 jenkins/build.sh               |  5 +++--
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/jenkins/build-opm-upscaling.sh b/jenkins/build-opm-upscaling.sh
index bafb23f..9a7cf42 100755
--- a/jenkins/build-opm-upscaling.sh
+++ b/jenkins/build-opm-upscaling.sh
@@ -1,24 +1,6 @@
 #!/bin/bash
 
 function build_opm_upscaling {
-  # Build ERT
-  pushd .
-  mkdir -p $WORKSPACE/deps/ert
-  cd $WORKSPACE/deps/ert
-  git init .
-  git remote add origin https://github.com/Ensembles/ert
-  git fetch --depth 1 origin $ERT_REVISION:branch_to_build
-  test $? -eq 0 || exit 1
-  git checkout branch_to_build
-  popd
-
-  pushd .
-  mkdir -p serial/build-ert
-  cd serial/build-ert
-  cmake $WORKSPACE/deps/ert/devel -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install
-  cmake --build . --target install
-  popd
-
   # Build opm-common
   pushd .
   mkdir -p $WORKSPACE/deps/opm-common
@@ -29,10 +11,11 @@ function build_opm_upscaling {
   test $? -eq 0 || exit 1
   git checkout branch_to_build
   popd
+
   source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh
 
   pushd .
-  mkdir serial/build-opm-common
+  mkdir -p serial/build-opm-common
   cd serial/build-opm-common
   build_module "-DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install" 0 $WORKSPACE/deps/opm-common
   test $? -eq 0 || exit 1
diff --git a/jenkins/build-pr.sh b/jenkins/build-pr.sh
index 3e575af..3756807 100755
--- a/jenkins/build-pr.sh
+++ b/jenkins/build-pr.sh
@@ -3,27 +3,23 @@
 source `dirname $0`/build-opm-upscaling.sh
 
 declare -a upstreams
-upstreams=(opm-parser
+upstreams=(ert
+           opm-parser
            opm-output
            opm-material
            opm-core
            opm-grid)
 
 declare -A upstreamRev
+upstreamRev[ert]=master
 upstreamRev[opm-parser]=master
 upstreamRev[opm-material]=master
 upstreamRev[opm-core]=master
 upstreamRev[opm-grid]=master
 upstreamRev[opm-output]=master
 
-ERT_REVISION=master
 OPM_COMMON_REVISION=master
 
-if grep -q "ert=" <<< $ghprbCommentBody
-then
-  ERT_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*ert=([0-9]+).*/\1/g'`/merge
-fi
-
 if grep -q "opm-common=" <<< $ghprbCommentBody
 then
   OPM_COMMON_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-common=([0-9]+).*/\1/g'`/merge
@@ -37,7 +33,7 @@ do
   fi
 done
 
-echo "Building with ert=$ERT_REVISION opm-common=$OPM_COMMON_REVISION opm-parser=${upstreamRev[opm-parser]} opm-material=${upstreamRev[opm-material]} opm-core=${upstreamRev[opm-core]} opm-grid=${upstreamRev[opm-grid]} opm-output=${upstreamRev[opm-output]} opm-upscaling=$sha1"
+echo "Building with opm-common=$OPM_COMMON_REVISION ert=${upstreamRev[ert]} opm-parser=${upstreamRev[opm-parser]} opm-material=${upstreamRev[opm-material]} opm-core=${upstreamRev[opm-core]} opm-grid=${upstreamRev[opm-grid]} opm-output=${upstreamRev[opm-output]} opm-upscaling=$sha1"
 
 build_opm_upscaling
 test $? -eq 0 || exit 1
diff --git a/jenkins/build.sh b/jenkins/build.sh
index 9795edb..54db92a 100755
--- a/jenkins/build.sh
+++ b/jenkins/build.sh
@@ -3,20 +3,21 @@
 source `dirname $0`/build-opm-upscaling.sh
 
 declare -a upstreams
-upstreams=(opm-parser
+upstreams=(ert
+           opm-parser
            opm-output
            opm-material
            opm-core
            opm-grid)
 
 declare -A upstreamRev
+upstreamRev[ert]=master
 upstreamRev[opm-parser]=master
 upstreamRev[opm-material]=master
 upstreamRev[opm-core]=master
 upstreamRev[opm-grid]=master
 upstreamRev[opm-output]=master
 
-ERT_REVISION=master
 OPM_COMMON_REVISION=master
 
 build_opm_upscaling