Skip to content

Commit abc0587

Browse files
Yakov Feldmanyakov-feldman
authored andcommitted
DEVO-242: Run regressions and release 5.2.7
1 parent 1688522 commit abc0587

File tree

1 file changed

+18
-27
lines changed

1 file changed

+18
-27
lines changed

Jenkinsfile

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,9 @@ pipeline{
351351
}
352352
}
353353
stage('rh7-singlenode'){
354-
when {
355-
expression{
356-
props = readProperties file:'data-hub/pipeline.properties'
357-
return (env.BRANCH_NAME==props['ExecutionBranch'] || params.regressions)
358-
}
354+
when {
355+
expression {return params.regressions}
356+
beforeAgent true
359357
}
360358
agent { label 'dhfLinuxAgent'}
361359
steps{timeout(time: 3, unit: 'HOURS'){
@@ -392,12 +390,10 @@ pipeline{
392390
}
393391
}
394392
stage('Linux Core Parallel Execution'){
395-
when {
396-
expression{
397-
props = readProperties file:'data-hub/pipeline.properties'
398-
return (env.BRANCH_NAME==props['ExecutionBranch'] || params.regressions)
399-
}
400-
}
393+
when {
394+
expression {return params.regressions}
395+
beforeAgent true
396+
}
401397
parallel{
402398
stage('rh7_cluster_10.0-Nightly'){
403399
agent { label 'dhfLinuxAgent'}
@@ -496,12 +492,11 @@ pipeline{
496492
}
497493
}
498494
}
495+
499496
stage('example projects parallel'){
500-
when {
501-
expression{
502-
props = readProperties file:'data-hub/pipeline.properties'
503-
return (env.BRANCH_NAME==props['ExecutionBranch'] || params.regressions)
504-
}
497+
when {
498+
expression {return params.regressions}
499+
beforeAgent true
505500
}
506501
parallel{
507502
stage('dh5-example'){
@@ -650,11 +645,9 @@ pipeline{
650645

651646
}
652647
stage('quick start linux parallel'){
653-
when {
654-
expression{
655-
props = readProperties file:'data-hub/pipeline.properties'
656-
return (env.BRANCH_NAME==props['ExecutionBranch'] || params.regressions)
657-
}
648+
when {
649+
expression {return params.regressions}
650+
beforeAgent true
658651
}
659652
parallel{
660653
stage('qs_rh7_90-nightly'){
@@ -729,11 +722,9 @@ pipeline{
729722
}}
730723
}}
731724
stage('Windows Core Parallel'){
732-
when {
733-
expression{
734-
props = readProperties file:'data-hub/pipeline.properties'
735-
return (env.BRANCH_NAME==props['ExecutionBranch'] || params.regressions)
736-
}
725+
when {
726+
expression {return params.regressions}
727+
beforeAgent true
737728
}
738729
parallel{
739730
stage('w12_SN_9.0-Nightly'){
@@ -890,7 +881,7 @@ pipeline{
890881
when {
891882
expression{
892883
props = readProperties file:'data-hub/pipeline.properties';
893-
return (env.BRANCH_NAME==props['ReleaseBranch'] || params.regressions)
884+
return (env.BRANCH_NAME==props['ReleaseBranch'] && !params.regressions)
894885
}
895886
}
896887
agent { label 'dhfLinuxAgent'}

0 commit comments

Comments
 (0)