simplify jenkins scripts after ert reorganization
This commit is contained in:
parent
e2fe88c739
commit
ab0dbee33d
@ -24,7 +24,12 @@ function clone_module {
|
|||||||
mkdir -p $WORKSPACE/deps/$1
|
mkdir -p $WORKSPACE/deps/$1
|
||||||
cd $WORKSPACE/deps/$1
|
cd $WORKSPACE/deps/$1
|
||||||
git init .
|
git init .
|
||||||
git remote add origin https://github.com/OPM/$1
|
if [ "$1" == "ert" ]
|
||||||
|
then
|
||||||
|
git remote add origin https://github.com/Ensembles/$1
|
||||||
|
else
|
||||||
|
git remote add origin https://github.com/OPM/$1
|
||||||
|
fi
|
||||||
git fetch --depth 1 origin $2:branch_to_build
|
git fetch --depth 1 origin $2:branch_to_build
|
||||||
git checkout branch_to_build
|
git checkout branch_to_build
|
||||||
test $? -eq 0 || exit 1
|
test $? -eq 0 || exit 1
|
||||||
|
@ -31,7 +31,8 @@ source $WORKSPACE/deps/opm-common/jenkins/setup-opm-data.sh
|
|||||||
|
|
||||||
# Downstream revisions
|
# Downstream revisions
|
||||||
declare -a downstreams
|
declare -a downstreams
|
||||||
downstreams=(opm-parser
|
downstreams=(ert
|
||||||
|
opm-parser
|
||||||
opm-output
|
opm-output
|
||||||
opm-material
|
opm-material
|
||||||
opm-core
|
opm-core
|
||||||
@ -41,6 +42,7 @@ downstreams=(opm-parser
|
|||||||
ewoms)
|
ewoms)
|
||||||
|
|
||||||
declare -A downstreamRev
|
declare -A downstreamRev
|
||||||
|
downstreamRev[ert]=master
|
||||||
downstreamRev[opm-parser]=master
|
downstreamRev[opm-parser]=master
|
||||||
downstreamRev[opm-material]=master
|
downstreamRev[opm-material]=master
|
||||||
downstreamRev[opm-core]=master
|
downstreamRev[opm-core]=master
|
||||||
@ -50,25 +52,6 @@ downstreamRev[opm-simulators]=master
|
|||||||
downstreamRev[opm-upscaling]=master
|
downstreamRev[opm-upscaling]=master
|
||||||
downstreamRev[ewoms]=master
|
downstreamRev[ewoms]=master
|
||||||
|
|
||||||
# Build ERT
|
|
||||||
echo "Building downstream ert=$ERT_REVISION"
|
|
||||||
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: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 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$WORKSPACE/serial/install
|
|
||||||
cmake --build . --target install
|
|
||||||
popd
|
|
||||||
|
|
||||||
build_downstreams opm-common
|
build_downstreams opm-common
|
||||||
|
|
||||||
test $? -eq 0 || exit 1
|
test $? -eq 0 || exit 1
|
||||||
|
Loading…
Reference in New Issue
Block a user