From dac21c16392ab160bd4d94ec53f3506234369405 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Sun, 17 Mar 2019 00:56:26 +0100 Subject: [PATCH] Wrap parallel pipelines in single sequential stage. --- Jenkinsfile | 94 ++++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 45 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 101d17f..25e1096 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,53 +2,57 @@ def MODULE_GIT_URL="https://github.com/openresty/lua-nginx-module.git" pipeline { agent none - parallel { - stage("Build on nginx:stable-alpine") { - agent { - docker { - image 'nginx:stable-alpine' - label 'linux && docker && amd64' + stages { + stage('Build') { + parallel { + stage("Build on nginx:stable-alpine") { + agent { + docker { + image 'nginx:stable-alpine' + label 'linux && docker && amd64' + } + } + steps { + sh 'apk add --no-cache curl gnupg1' + sh './download-nginx.sh' + + dir('module') { + git changelog: false, url: MODULE_GIT_URL + } + + /* BUILD DEPENDENCIES */ + sh 'apk add lua5.1-dev luajit-dev' + // FIXME - workaround wrong include path for luajit + sh 'echo "#include " > /usr/include/luajit.h' + + sh './build-alpine.sh' + archiveArtifacts "*.so,required_packages.txt" + } } - } - steps { - sh 'apk add --no-cache curl gnupg1' - sh './download-nginx.sh' - - dir('module') { - git changelog: false, url: MODULE_GIT_URL + stage("Build on nginx:mainline-alpine") { + agent { + docker { + image 'nginx:mainline-alpine' + label 'linux && docker && amd64' + } + } + steps { + sh 'apk add --no-cache curl gnupg1' + sh './download-nginx.sh' + + dir('module') { + git changelog: false, url: MODULE_GIT_URL + } + + /* BUILD DEPENDENCIES */ + sh 'apk add lua5.1-dev luajit-dev' + // FIXME - workaround wrong include path for luajit + sh 'echo "#include " > /usr/include/luajit.h' + + sh './build-alpine.sh' + archiveArtifacts "*.so,required_packages.txt" + } } - - /* BUILD DEPENDENCIES */ - sh 'apk add lua5.1-dev luajit-dev' - // FIXME - workaround wrong include path for luajit - sh 'echo "#include " > /usr/include/luajit.h' - - sh './build-alpine.sh' - archiveArtifacts "*.so,required_packages.txt" - } - } - stage("Build on nginx:mainline-alpine") { - agent { - docker { - image 'nginx:mainline-alpine' - label 'linux && docker && amd64' - } - } - steps { - sh 'apk add --no-cache curl gnupg1' - sh './download-nginx.sh' - - dir('module') { - git changelog: false, url: MODULE_GIT_URL - } - - /* BUILD DEPENDENCIES */ - sh 'apk add lua5.1-dev luajit-dev' - // FIXME - workaround wrong include path for luajit - sh 'echo "#include " > /usr/include/luajit.h' - - sh './build-alpine.sh' - archiveArtifacts "*.so,required_packages.txt" } } }