diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-04-24 06:52:48 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2020-04-24 06:52:48 (GMT) |
| commit | 0f6b4551053d467b69cdb77e63bcb369efcc560d (patch) | |
| tree | 6146cac6a4ea0a2687c5551f2146697b8ccf9e40 | |
| parent | bd219dee5210e48a7805af42011213fc20b64b2c (diff) | |
| download | Qt-0f6b4551053d467b69cdb77e63bcb369efcc560d.zip Qt-0f6b4551053d467b69cdb77e63bcb369efcc560d.tar.gz Qt-0f6b4551053d467b69cdb77e63bcb369efcc560d.tar.bz2 | |
Removed Groovy catch statement from Linux buildrefs/changes/64/11064/1
Change-Id: I0bfd27b6676a190519f58a863a49c609857229db
| -rw-r--r-- | Jenkinsfile | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 630e789..67cd46b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,36 +21,27 @@ properties([ stage('Build') { parallel linux: { node('bslp02-centos6-64') { - try { - deleteDir() - checkout([$class: 'GitSCM', - branches: [[name: BRANCH]], - doGenerateSubmoduleConfigurations: false, - extensions: [], - submoduleCfg: [], - userRemoteConfigs: [[url: REPO]]]) + deleteDir() + checkout([$class: 'GitSCM', + branches: [[name: BRANCH]], + doGenerateSubmoduleConfigurations: false, + extensions: [], + submoduleCfg: [], + userRemoteConfigs: [[url: REPO]]]) - stage("Qt Build") { - sh '''#!/bin/bash - export PATH=$GCC_PATH/bin:$PATH - make GCC_PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc -f Makefile all - ''' - } - stage("Qt-Creator Build") { - sh '''#!/bin/bash - export PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc/bin:$PATH - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$WORKSPACE/install.x86-linux64/qt-5.14.2-shared/lib - make ARCH=x86-linux64 GCC_PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc/bin QTDIR=$WORKSPACE/install.x86-linux64/qt-5.14.2-shared -f Makefile.qtcreator all - ''' - } - } catch (e) { - echo 'Linux build failed' - } finally { - sh '''#!/bin/bash - echo "Build failed" - exit 1 - ''' - } + stage("Qt Build") { + sh '''#!/bin/bash + export PATH=$GCC_PATH/bin:$PATH + make GCC_PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc -f Makefile all + ''' + } + stage("Qt-Creator Build") { + sh '''#!/bin/bash + export PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc/bin:$PATH + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$WORKSPACE/install.x86-linux64/qt-5.14.2-shared/lib + make ARCH=x86-linux64 GCC_PATH=/master/DEV-Tools/gcc-suite/1.6.0/x86-linux64/gcc/bin QTDIR=$WORKSPACE/install.x86-linux64/qt-5.14.2-shared -f Makefile.qtcreator all + ''' + } } }, windows: { |