Jenkinsfile: fix parallel step declaration

This commit is contained in:
Matthias Schiffer 2019-12-29 15:59:29 +01:00 committed by Martin Weinelt
parent 4de6f3ff36
commit 7302fbf5ab
1 changed files with 15 additions and 21 deletions

View File

@ -1,22 +1,5 @@
def lualint() {
make lint-lua
}
def shelllint() {
make lint-sh
}
run_lint_set = [
"task1": {
lualint()
},
"task2": {
shelllint()
}
]
pipeline { pipeline {
agent { label 'gluon-docker' } agent none
environment { environment {
GLUON_SITEDIR = "contrib/ci/minimal-site" GLUON_SITEDIR = "contrib/ci/minimal-site"
GLUON_TARGET = "x86-64" GLUON_TARGET = "x86-64"
@ -24,18 +7,29 @@ pipeline {
} }
stages { stages {
stage('lint') { stage('lint') {
steps { parallel {
script { stage('lint-lua') {
parallel(run_lint_set) agent { label 'gluon-docker' }
steps {
sh 'make lint-lua'
}
}
stage('lint-sh') {
agent { label 'gluon-docker' }
steps {
sh 'make lint-sh'
}
} }
} }
} }
stage('docs') { stage('docs') {
agent { label 'gluon-docker' }
steps { steps {
sh 'make -C docs html' sh 'make -C docs html'
} }
} }
stage('build') { stage('build') {
agent { label 'gluon-docker' }
steps { steps {
sh 'make update' sh 'make update'
sh 'test -d /dl_cache && ln -s /dl_cache openwrt/dl || true' sh 'test -d /dl_cache && ln -s /dl_cache openwrt/dl || true'