From 101730cb5e20da59fab238cc839e92195fa6f836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Wed, 6 Apr 2016 12:32:02 +0200
Subject: [PATCH] Rename in Jenkins scripts.

---
 jenkins/README.md              | 6 +++---
 jenkins/build-opm-upscaling.sh | 4 ++--
 jenkins/build-pr.sh            | 8 ++++----
 jenkins/build.sh               | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jenkins/README.md b/jenkins/README.md
index 1b61194..e407e68 100644
--- a/jenkins/README.md
+++ b/jenkins/README.md
@@ -12,14 +12,14 @@ It is intended for post-merge builds of the master branch.
 This script will build dependencies, then build opm-upscaling and execute its tests.
 It inspects the $ghbPrBuildComment environmental variable to obtain a pull request
 to use for ert, opm-common, opm-parser, opm-material, opm-core, opm-output
-and dune-cornerpoint (defaults to master) and then builds $sha1 of opm-upscaling.
+and opm-grid (defaults to master) and then builds $sha1 of opm-upscaling.
 
 It is intended for pre-merge builds of pull requests.
 
 You can optionally specify a given pull request to use for ert, opm-common,
-opm-parser, opm-material, opm-core and dune-cornerpoint through the trigger.
+opm-parser, opm-material, opm-core and opm-grid through the trigger.
 The trigger line needs to contain ert=&lt;pull request number&gt; and/or
 opm-common=&lt;pull request number&gt; and/or opm-parser=&lt;pull request number&gt;
 and/or opm-material=&lt;pull request number&gt; and/or opm-core=&lt;pull request number&gt;
 and/or opm-output=&lt;pull request number&gt;
-and/or dune-cornerpoint=&lt;pull request number&gt;.
+and/or opm-grid=&lt;pull request number&gt;.
diff --git a/jenkins/build-opm-upscaling.sh b/jenkins/build-opm-upscaling.sh
index 3db6eb7..225e264 100755
--- a/jenkins/build-opm-upscaling.sh
+++ b/jenkins/build-opm-upscaling.sh
@@ -50,8 +50,8 @@ function build_opm_upscaling {
   clone_and_build_module opm-core "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install" $OPM_CORE_REVISION $WORKSPACE/serial
   test $? -eq 0 || exit 1
 
-  # Build dune-cornerpoint
-  clone_and_build_module dune-cornerpoint "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install" $DUNE_CORNERPOINT_REVISION $WORKSPACE/serial
+  # Build opm-grid
+  clone_and_build_module opm-grid "-DCMAKE_PREFIX_PATH=$WORKSPACE/serial/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install" $OPM_GRID_REVISION $WORKSPACE/serial
   test $? -eq 0 || exit 1
 
   # Build opm-output
diff --git a/jenkins/build-pr.sh b/jenkins/build-pr.sh
index afad6de..4d72f8e 100755
--- a/jenkins/build-pr.sh
+++ b/jenkins/build-pr.sh
@@ -7,7 +7,7 @@ OPM_COMMON_REVISION=master
 OPM_PARSER_REVISION=master
 OPM_MATERIAL_REVISION=master
 OPM_CORE_REVISION=master
-DUNE_CORNERPOINT_REVISION=master
+OPM_GRID_REVISION=master
 OPM_OUTPUT_REVISION=master
 OPM_UPSCALING_REVISION=$sha1
 
@@ -36,9 +36,9 @@ then
   OPM_CORE_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-core=([0-9]+).*/\1/g'`/merge
 fi
 
-if grep -q "dune-cornerpoint=" <<< $ghprbCommentBody
+if grep -q "opm-grid=" <<< $ghprbCommentBody
 then
-  DUNE_CORNERPOINT_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*dune-cornerpoint=([0-9]+).*/\1/g'`/merge
+  OPM_GRID_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-grid=([0-9]+).*/\1/g'`/merge
 fi
 
 if grep -q "opm-output=" <<< $ghprbCommentBody
@@ -46,7 +46,7 @@ then
   OPM_OUTPUT_REVISION=pull/`echo $ghprbCommentBody | sed -r 's/.*opm-output=([0-9]+).*/\1/g'`/merge
 fi
 
-echo "Building with ert=$ERT_REVSIION opm-common=$OPM_COMMON_REVISION opm-parser=$OPM_PARSER_REVISION opm-material=$OPM_MATERIAL_REVISION opm-core=$OPM_CORE_REVISION dune-cornerpoint=$DUNE_CORNERPOINT_REVISION opm-output=$OPM_OUTPUT_REVISION opm-upscaling=$OPM_UPSCALING_REVISION"
+echo "Building with ert=$ERT_REVSIION opm-common=$OPM_COMMON_REVISION opm-parser=$OPM_PARSER_REVISION opm-material=$OPM_MATERIAL_REVISION opm-core=$OPM_CORE_REVISION opm-grid=$OPM_GRID_REVISION opm-output=$OPM_OUTPUT_REVISION opm-upscaling=$OPM_UPSCALING_REVISION"
 
 build_opm_upscaling
 test $? -eq 0 || exit 1
diff --git a/jenkins/build.sh b/jenkins/build.sh
index d0e35a2..1ff2554 100755
--- a/jenkins/build.sh
+++ b/jenkins/build.sh
@@ -7,7 +7,7 @@ OPM_COMMON_REVISION=master
 OPM_PARSER_REVISION=master
 OPM_MATERIAL_REVISION=master
 OPM_CORE_REVISION=master
-DUNE_CORNERPOINT_REVISION=master
+OPM_GRID_REVISION=master
 OPM_OUTPUT_REVISION=master
 
 build_opm_upscaling