Commit 11eab688 authored by hardy's avatar hardy

fix executor agent syntax

parent fceea50a
...@@ -51,15 +51,12 @@ def StatusForDb = "" ...@@ -51,15 +51,12 @@ def StatusForDb = ""
pipeline { pipeline {
agent none agent {label pythonExecutor}
options { options {
disableConcurrentBuilds() disableConcurrentBuilds()
ansiColor('xterm') ansiColor('xterm')
lock(extra: [[resource: ciSmartPhonesResource2]], resource: ciSmartPhonesResource1) lock(extra: [[resource: ciSmartPhonesResource2]], resource: ciSmartPhonesResource1)
} }
stages {
stage ("Py Exec"){
agent {label pythonExecutor}
stages { stages {
stage("Build Init") { stage("Build Init") {
steps { steps {
...@@ -276,16 +273,8 @@ pipeline { ...@@ -276,16 +273,8 @@ pipeline {
} }
} }
} }
} stage ("SQL Collect"){
}
}
}
stage ("DB Host"){
agent {label DataBaseHost} agent {label DataBaseHost}
stages {
stage("SQL Collect ") {
steps { steps {
script { script {
if (currentBuild.result=='FAILURE') {StatusForDb = 'FAIL'} else {StatusForDb = 'PASS'} if (currentBuild.result=='FAILURE') {StatusForDb = 'FAIL'} else {StatusForDb = 'PASS'}
...@@ -295,12 +284,10 @@ pipeline { ...@@ -295,12 +284,10 @@ pipeline {
} }
} }
} }
} }
post { post {
always { always {
node(pythonExecutor){
script { script {
if (params.pipelineZipsConsoleLog != null) { if (params.pipelineZipsConsoleLog != null) {
if (params.pipelineZipsConsoleLog) { if (params.pipelineZipsConsoleLog) {
...@@ -315,5 +302,4 @@ pipeline { ...@@ -315,5 +302,4 @@ pipeline {
} }
} }
} }
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment