@@ -14,6 +14,7 @@ import com.fasterxml.jackson.databind.JsonNode
1414import com.fasterxml.jackson.databind.ObjectMapper
1515
1616import org.elasticsearch.gradle.Version
17+ import org.elasticsearch.gradle.VersionProperties
1718import org.elasticsearch.gradle.internal.BaseInternalPluginBuildPlugin
1819import org.elasticsearch.gradle.internal.ResolveAllDependencies
1920import org.elasticsearch.gradle.util.GradleUtils
@@ -118,10 +119,10 @@ tasks.register("updateCIBwcVersions") {
118119 outputFile. text = " # This file is auto-generated. See ${ pipelineTemplatePath} \n " + pipeline
119120 }
120121
121- // Writes a Buildkite pipelime from a template, and replaces $BWC_LIST with an array of versions
122+ // Writes a Buildkite pipelime from a template, and replaces a variable with an array of versions
122123 // Useful for writing a list of versions in a matrix configuration
123- def expandBwcList = { String outputFilePath , String pipelineTemplatePath , List<Version > versions ->
124- writeBuildkitePipeline(outputFilePath, pipelineTemplatePath, [new ListExpansion (versions : versions, variable : " BWC_LIST " )])
124+ def expandList = { String outputFilePath , String pipelineTemplatePath , String variable , List<Version > versions ->
125+ writeBuildkitePipeline(outputFilePath, pipelineTemplatePath, [new ListExpansion (versions : versions, variable : variable )])
125126 }
126127
127128 // Writes a Buildkite pipeline from a template, and replaces $BWC_STEPS with a list of steps, one for each version
@@ -133,11 +134,18 @@ tasks.register("updateCIBwcVersions") {
133134 doLast {
134135 writeVersions(file(" .ci/bwcVersions" ), filterIntermediatePatches(buildParams. bwcVersions. allIndexCompatible))
135136 writeVersions(file(" .ci/snapshotBwcVersions" ), filterIntermediatePatches(buildParams. bwcVersions. unreleasedIndexCompatible))
136- expandBwcList (
137+ expandList (
137138 " .buildkite/pipelines/intake.yml" ,
138139 " .buildkite/pipelines/intake.template.yml" ,
140+ " BWC_LIST" ,
139141 filterIntermediatePatches(buildParams. bwcVersions. unreleasedIndexCompatible)
140142 )
143+ expandList(
144+ " .buildkite/pipelines/periodic-fwc.yml" ,
145+ " .buildkite/pipelines/periodic-fwc.template.yml" ,
146+ " FWC_LIST" ,
147+ buildParams. bwcVersions. released. findAll { it. major == VersionProperties . elasticsearchVersion. major && it. minor == VersionProperties . elasticsearchVersion. minor }
148+ )
141149 writeBuildkitePipeline(
142150 " .buildkite/pipelines/periodic.yml" ,
143151 " .buildkite/pipelines/periodic.template.yml" ,
0 commit comments