@@ -20,7 +20,7 @@ pipeline {
20
20
stages {
21
21
stage(' Nighly beats builds' ) {
22
22
steps {
23
- runBuilds(quietPeriodFactor : 2000 , branches : [' main' , ' 8.<minor>' , ' 7.<minor >' , ' 7.<next- minor>' ])
23
+ runBuilds(quietPeriodFactor : 2000 , branches : [' main' , ' 8.<minor>' , ' 8.<next-patch >' , ' 7.<minor>' ])
24
24
}
25
25
}
26
26
}
@@ -32,15 +32,7 @@ pipeline {
32
32
}
33
33
34
34
def runBuilds (Map args = [:]) {
35
- def branches = []
36
- // Expand macros and filter duplicated matches.
37
- args. branches. each { branch ->
38
- def branchName = getBranchName(branch)
39
- if (! branches. contains(branchName)) {
40
- branches << branchName
41
- }
42
- }
43
-
35
+ def branches = getBranchesFromAliases(aliases : args. branches)
44
36
def quietPeriod = 0
45
37
branches. each { branch ->
46
38
build(quietPeriod : quietPeriod,
@@ -50,24 +42,6 @@ def runBuilds(Map args = [:]) {
50
42
booleanParam(name : ' end_to_end_tests_ci' , value : true )
51
43
],
52
44
wait : false , propagate : false )
53
- // Increate the quiet period for the next iteration
54
45
quietPeriod + = args. quietPeriodFactor
55
46
}
56
47
}
57
-
58
- def getBranchName (branch ) {
59
- // special macro to look for the latest minor version
60
- if (branch. contains(' 8.<minor>' )) {
61
- return bumpUtils. getMajorMinor(bumpUtils. getCurrentMinorReleaseFor8())
62
- }
63
- if (branch. contains(' 8.<next-minor>' )) {
64
- return bumpUtils. getMajorMinor(bumpUtils. getNextMinorReleaseFor8())
65
- }
66
- if (branch. contains(' 7.<minor>' )) {
67
- return bumpUtils. getMajorMinor(bumpUtils. getCurrentMinorReleaseFor7())
68
- }
69
- if (branch. contains(' 7.<next-minor>' )) {
70
- return bumpUtils. getMajorMinor(bumpUtils. getNextMinorReleaseFor7())
71
- }
72
- return branch
73
- }
0 commit comments