diff --git a/Jenkinsfile b/Jenkinsfile index fafe268..6379bad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,13 +32,11 @@ pipeline { script { params.LIBRARIES.split().each { LIBRARY -> stage("${LIBRARY}") { - stages { - params.R6RS_SCHEMES.split().each { SCHEME -> - def IMG="${SCHEME}:head" - stage("${SCHEME} - ${LIBRARY}") { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r6rs-docker" - } + params.R6RS_SCHEMES.split().each { SCHEME -> + def IMG="${SCHEME}:head" + stage("${SCHEME} - ${LIBRARY}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r6rs-docker" } } } @@ -52,16 +50,14 @@ pipeline { script { params.LIBRARIES.split().each { LIBRARY -> stage("${LIBRARY}") { - stages { - params.R7RS_SCHEMES.split().each { SCHEME -> - def IMG="${SCHEME}:head" - if("${SCHEME}" == "chicken") { - IMG="${SCHEME}:5" - } - stage("${SCHEME} - ${LIBRARY}") { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker" - } + params.R7RS_SCHEMES.split().each { SCHEME -> + def IMG="${SCHEME}:head" + if("${SCHEME}" == "chicken") { + IMG="${SCHEME}:5" + } + stage("${SCHEME} - ${LIBRARY}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker" } } }