Skip to content

Commit 6ca367d

Browse files
Fixing the agent allocation
1 parent 8085214 commit 6ca367d

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Jenkinsfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@Library('shared-libraries') _
22

33
def runTests(String type,String version){
4-
sh 'rm -rf $WORKSPACE/xdmp'
54
copyRPM type,version
65
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
76
sh '''
@@ -30,7 +29,6 @@ def runAuditReport(){
3029
}
3130

3231
def runE2ETests(String type,String version){
33-
sh 'rm -rf $WORKSPACE/xdmp'
3432
copyRPM type,version
3533
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
3634
sh '''
@@ -63,7 +61,7 @@ def runE2ETests(String type,String version){
6361

6462
}
6563
pipeline{
66-
agent {label 'nodeclientpool'}
64+
agent none
6765
triggers{
6866
parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "")
6967
}
@@ -81,6 +79,7 @@ pipeline{
8179
}
8280
stages{
8381
stage('runtests-11.0.2'){
82+
agent {label 'nodeclientpool'}
8483
steps{
8584
runAuditReport()
8685
runTests('Release','11.0.2')
@@ -96,6 +95,7 @@ pipeline{
9695
expression {return params.regressions}
9796
}
9897
}
98+
agent {label 'nodeclientpool'}
9999
steps{
100100
runTests('Latest','11')
101101
runE2ETests('Latest','11')
@@ -108,6 +108,7 @@ pipeline{
108108
expression {return params.regressions}
109109
}
110110
}
111+
agent {label 'nodeclientpool'}
111112
steps{
112113
runTests('Latest','12.0')
113114
runE2ETests('Latest','12.0')
@@ -120,6 +121,7 @@ pipeline{
120121
expression {return params.regressions}
121122
}
122123
}
124+
agent {label 'nodeclientpool'}
123125
steps{
124126
runTests('Latest','10.0')
125127
runE2ETests('Latest','10.0')
@@ -132,6 +134,7 @@ pipeline{
132134
expression {return params.regressions}
133135
}
134136
}
137+
agent {label 'nodeclientpool'}
135138
steps{
136139
runTests('Release','10.0-9.5')
137140
runE2ETests('Release','10.0-9.5')

0 commit comments

Comments
 (0)