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

update jenkins build scripts

Browse Source 
output is now an upstream and not a downstream
This commit is contained in:
Arne Morten Kvarving 2016-06-10 13:20:26 +02:00
parent d3aa0926c8
commit 6a8ddb76b2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jenkins/build-pr.sh
View File

@ -5,11 +5,13 @@ source `dirname $0`/build-opm-core.sh
# Upstream revisions # Upstream revisions
declare -a upstreams declare -a upstreams
upstreams=(opm-parser upstreams=(opm-parser
opm-material) opm-material
opm-output)
declare -A upstreamRev declare -A upstreamRev
upstreamRev[opm-parser]=master upstreamRev[opm-parser]=master
upstreamRev[opm-material]=master upstreamRev[opm-material]=master
upstreamRev[opm-output]=master
ERT_REVISION=master ERT_REVISION=master
OPM_COMMON_REVISION=master OPM_COMMON_REVISION=master
@ -32,7 +34,7 @@ do
fi fi
done done
echo "Building with ert=$ERT_REVISION opm-common=$OPM_COMMON_REVISION opm-parser=${upstreamRev[opm-parser]} opm-material=${upstreamRev[opm-material]} opm-core=$sha1" echo "Building with ert=$ERT_REVISION opm-common=$OPM_COMMON_REVISION opm-parser=${upstreamRev[opm-parser]} opm-material=${upstreamRev[opm-material]} opm-output=${upstreamRev[opm-output]} opm-core=$sha1"
build_opm_core build_opm_core
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
@ -40,7 +42,7 @@ test $? -eq 0 || exit 1
# If no downstream builds we are done # If no downstream builds we are done
if ! grep -q "with downstreams" <<< $ghprbCommentBody if ! grep -q "with downstreams" <<< $ghprbCommentBody
then then
cp serial/build-opm-material/testoutput.xml . cp serial/build-opm-core/testoutput.xml .
exit 0 exit 0
fi fi
@ -50,14 +52,12 @@ source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh
# Downstream revisions # Downstream revisions
declare -a downstreams declare -a downstreams
downstreams=(opm-grid downstreams=(opm-grid
opm-output
opm-simulators opm-simulators
opm-upscaling opm-upscaling
ewoms) ewoms)
declare -A downstreamRev declare -A downstreamRev
downstreamRev[opm-grid]=master downstreamRev[opm-grid]=master
downstreamRev[opm-output]=master
downstreamRev[opm-simulators]=master downstreamRev[opm-simulators]=master
downstreamRev[opm-upscaling]=master downstreamRev[opm-upscaling]=master
downstreamRev[ewoms]=master downstreamRev[ewoms]=master

4
jenkins/build.sh
View File

@ -5,11 +5,13 @@ source `dirname $0`/build-opm-core.sh
# Upstream revisions # Upstream revisions
declare -a upstreams declare -a upstreams
upstreams=(opm-parser upstreams=(opm-parser
opm-material) opm-material
opm-output)
declare -A upstreamRev declare -A upstreamRev
upstreamRev[opm-parser]=master upstreamRev[opm-parser]=master
upstreamRev[opm-material]=master upstreamRev[opm-material]=master
upstreamRev[opm-output]=master
ERT_REVISION=master ERT_REVISION=master
OPM_COMMON_REVISION=master OPM_COMMON_REVISION=master