ci: use getBranchesFromAliases and support next-patch-8 (#30400)

elastic · Feb 16, 2022 · 9cecf3a · 9cecf3a
1 parent 342c4dc
commit 9cecf3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 52 deletions.
diff --git a/.ci/schedule-daily.groovy b/.ci/schedule-daily.groovy
@@ -20,7 +20,7 @@ pipeline {
   stages {
     stage('Nighly beats builds') {
       steps {
-        runBuilds(quietPeriodFactor: 2000, branches: ['main', '8.<minor>', '7.<minor>', '7.<next-minor>'])
+        runBuilds(quietPeriodFactor: 2000, branches: ['main', '8.<minor>', '8.<next-patch>', '7.<minor>'])
       }
     }
   }
@@ -32,14 +32,7 @@ pipeline {
 }
 
 def runBuilds(Map args = [:]) {
-  def branches = []
-  // Expand macros and filter duplicated matches.
-  args.branches.each { branch ->
-    def branchName = getBranchName(branch)
-    if (!branches.contains(branchName)) {
-      branches << branchName
-    }
-  }
+  def branches = getBranchesFromAliases(aliases: args.branches)
 
   def quietPeriod = 0
   branches.each { branch ->
@@ -48,20 +41,3 @@ def runBuilds(Map args = [:]) {
     quietPeriod += args.quietPeriodFactor
   }
 }
-
-def getBranchName(branch) {
-  // special macro to look for the latest minor version
-  if (branch.contains('8.<minor>')) {
-   return bumpUtils.getMajorMinor(bumpUtils.getCurrentMinorReleaseFor8())
-  }
-  if (branch.contains('8.<next-minor>')) {
-    return bumpUtils.getMajorMinor(bumpUtils.getNextMinorReleaseFor8())
-  }
-  if (branch.contains('7.<minor>')) {
-    return bumpUtils.getMajorMinor(bumpUtils.getCurrentMinorReleaseFor7())
-  }
-  if (branch.contains('7.<next-minor>')) {
-    return bumpUtils.getMajorMinor(bumpUtils.getNextMinorReleaseFor7())
-  }
-  return branch
-}
diff --git a/.ci/schedule-weekly.groovy b/.ci/schedule-weekly.groovy
@@ -20,7 +20,7 @@ pipeline {
   stages {
     stage('Weekly beats builds') {
       steps {
-        runBuilds(quietPeriodFactor: 1000, branches: ['main', '8.<minor>', '7.<minor>', '7.<next-minor>'])
+        runBuilds(quietPeriodFactor: 1000, branches: ['main', '8.<minor>', '8.<next-patch>', '7.<minor>'])
       }
     }
   }
@@ -32,14 +32,7 @@ pipeline {
 }
 
 def runBuilds(Map args = [:]) {
-  def branches = []
-  // Expand macros and filter duplicated matches.
-  args.branches.each { branch ->
-    def branchName = getBranchName(branch)
-    if (!branches.contains(branchName)) {
-      branches << branchName
-    }
-  }
+  def branches = getBranchesFromAliases(aliases: args.branches)
 
   def quietPeriod = 0
   branches.each { branch ->
@@ -48,20 +41,3 @@ def runBuilds(Map args = [:]) {
     quietPeriod += args.quietPeriodFactor
   }
 }
-
-def getBranchName(branch) {
-  // special macro to look for the latest minor version
-  if (branch.contains('8.<minor>')) {
-   return bumpUtils.getMajorMinor(bumpUtils.getCurrentMinorReleaseFor8())
-  }
-  if (branch.contains('8.<next-minor>')) {
-    return bumpUtils.getMajorMinor(bumpUtils.getNextMinorReleaseFor8())
-  }
-  if (branch.contains('7.<minor>')) {
-    return bumpUtils.getMajorMinor(bumpUtils.getCurrentMinorReleaseFor7())
-  }
-  if (branch.contains('7.<next-minor>')) {
-    return bumpUtils.getMajorMinor(bumpUtils.getNextMinorReleaseFor7())
-  }
-  return branch
-}