From 35ffdb8a176c6b16a626fdb147f7de5353c621c9 Mon Sep 17 00:00:00 2001 From: TomasKulhanek Date: Thu, 6 Dec 2018 17:26:54 +0000 Subject: UPDATE: jenkins build script and test to skip when other exception occurs --- build/jenkins-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build/jenkins-build.sh') diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 04f8da6..67bb559 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -5,8 +5,8 @@ module avail module load conda # it expects that git clone is done before this script launch # git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit -conda install conda-build +conda install -y conda-build #export CIL_VERSION=0.10.2 export CIL_VERSION=0.10.2 -cd CCPi-Regularisation-Toolkit +#cd CCPi-Regularisation-Toolkit # already there by jenkins conda build Wrappers/Python/conda-recipe -- cgit v1.2.3 From fbbe502caa70043824f75ec615932f0185c136b7 Mon Sep 17 00:00:00 2001 From: TomasKulhanek Date: Thu, 6 Dec 2018 22:51:23 +0000 Subject: debug cuda test --- build/jenkins-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/jenkins-build.sh') diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 67bb559..6e35e4a 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -9,4 +9,4 @@ conda install -y conda-build #export CIL_VERSION=0.10.2 export CIL_VERSION=0.10.2 #cd CCPi-Regularisation-Toolkit # already there by jenkins -conda build Wrappers/Python/conda-recipe +conda build --debug Wrappers/Python/conda-recipe -- cgit v1.2.3 From a1c76dc0abd20d78497ca368a7637c684807903a Mon Sep 17 00:00:00 2001 From: TomasKulhanek Date: Thu, 6 Dec 2018 23:44:09 +0000 Subject: less debug cuda test --- build/jenkins-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/jenkins-build.sh') diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 6e35e4a..67bb559 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -9,4 +9,4 @@ conda install -y conda-build #export CIL_VERSION=0.10.2 export CIL_VERSION=0.10.2 #cd CCPi-Regularisation-Toolkit # already there by jenkins -conda build --debug Wrappers/Python/conda-recipe +conda build Wrappers/Python/conda-recipe -- cgit v1.2.3 From e1f923fb8827dcb5b9763403080e2947d7b36fca Mon Sep 17 00:00:00 2001 From: TomasKulhanek Date: Fri, 7 Dec 2018 11:16:04 +0000 Subject: skip reason --- build/jenkins-build.sh | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'build/jenkins-build.sh') diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 67bb559..b74c38d 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,12 +1,29 @@ #!/usr/bin/env bash # Script to builds source code in Jenkins environment +module try-load conda -module avail -module load conda -# it expects that git clone is done before this script launch +# install miniconda if the module is not present +if hash conda 2>/dev/null; then + echo using conda +else + if [ ! -f Miniconda3-latest-Linux-x86_64.sh ]; then + wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + chmod +x Miniconda3-latest-Linux-x86_64.sh + fi + ./Miniconda3-latest-Linux-x86_64.sh -u -b -p . + PATH=$PATH:./bin +fi + +# presume that git clone is done before this script launch # git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit conda install -y conda-build #export CIL_VERSION=0.10.2 -export CIL_VERSION=0.10.2 +if [[ -n ${CIL_VERSION} ]] +then + echo Using defined version: $CIL_VERSION +else + export CIL_VERSION=0.10.2 + echo Defining version: $CIL_VERSION +fi #cd CCPi-Regularisation-Toolkit # already there by jenkins conda build Wrappers/Python/conda-recipe -- cgit v1.2.3 From 3fe0a0b6fc3507d1c9f01a3e6d4d487c2c504efd Mon Sep 17 00:00:00 2001 From: TomasKulhanek Date: Fri, 7 Dec 2018 13:20:19 +0000 Subject: update version --- build/jenkins-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/jenkins-build.sh') diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index b74c38d..0c397b1 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -22,7 +22,7 @@ if [[ -n ${CIL_VERSION} ]] then echo Using defined version: $CIL_VERSION else - export CIL_VERSION=0.10.2 + export CIL_VERSION=0.10.3 echo Defining version: $CIL_VERSION fi #cd CCPi-Regularisation-Toolkit # already there by jenkins -- cgit v1.2.3