Skip to content

Commit d84fef9

Browse files
jozalajozala
committed
Tests corrected to be in line with new BwC test naming
1 parent 960b3e0 commit d84fef9

File tree

6 files changed

+64
-65
lines changed

6 files changed

+64
-65
lines changed

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,23 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
5151
assertOutputContains(result.output, "[$bwcDistVersion] > Task :distribution:archives:darwin-tar:${expectedAssembleTaskName}")
5252

5353
where:
54-
bwcDistVersion | bwcProject | expectedAssembleTaskName
55-
"8.4.0" | "minor" | "extractedAssemble"
56-
"8.3.0" | "staged" | "extractedAssemble"
57-
"8.2.1" | "bugfix" | "extractedAssemble"
58-
"8.1.3" | "bugfix2" | "extractedAssemble"
54+
bwcDistVersion | bwcProject | expectedAssembleTaskName
55+
"8.4.0" | "major1" | "extractedAssemble"
56+
"8.3.0" | "major2" | "extractedAssemble"
57+
"8.2.1" | "major3" | "extractedAssemble"
58+
"8.1.3" | "major4" | "extractedAssemble"
5959
}
6060

6161
@Unroll
6262
def "supports #platform aarch distributions"() {
6363
when:
64-
def result = gradleRunner(":distribution:bwc:minor:buildBwc${platform.capitalize()}Aarch64Tar",
64+
def result = gradleRunner(":distribution:bwc:major1:buildBwc${platform.capitalize()}Aarch64Tar",
6565
"-DtestRemoteRepo=" + remoteGitRepo,
6666
"-Dbwc.remote=origin",
6767
"-Dbwc.dist.version=${bwcDistVersion}-SNAPSHOT")
6868
.build()
6969
then:
70-
result.task(":distribution:bwc:minor:buildBwc${platform.capitalize()}Aarch64Tar").outcome == TaskOutcome.SUCCESS
70+
result.task(":distribution:bwc:major1:buildBwc${platform.capitalize()}Aarch64Tar").outcome == TaskOutcome.SUCCESS
7171

7272
and: "assemble tasks triggered"
7373
assertOutputContains(result.output, "[$bwcDistVersion] > Task :distribution:archives:${platform}-aarch64-tar:extractedAssemble")
@@ -87,7 +87,7 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
8787
}
8888
8989
dependencies {
90-
expandedDist project(path: ":distribution:bwc:minor", configuration:"expanded-darwin-tar")
90+
expandedDist project(path: ":distribution:bwc:major1", configuration:"expanded-darwin-tar")
9191
}
9292
9393
tasks.register("resolveExpandedDistribution") {
@@ -109,12 +109,12 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
109109
.build()
110110
then:
111111
result.task(":resolveExpandedDistribution").outcome == TaskOutcome.SUCCESS
112-
result.task(":distribution:bwc:minor:buildBwcDarwinTar").outcome == TaskOutcome.SUCCESS
112+
result.task(":distribution:bwc:major1:buildBwcDarwinTar").outcome == TaskOutcome.SUCCESS
113113
and: "assemble task triggered"
114114
result.output.contains("[8.4.0] > Task :distribution:archives:darwin-tar:extractedAssemble")
115-
result.output.contains("expandedRootPath /distribution/bwc/minor/build/bwc/checkout-8.x/" +
115+
result.output.contains("expandedRootPath /distribution/bwc/major1/build/bwc/checkout-8.x/" +
116116
"distribution/archives/darwin-tar/build/install")
117-
result.output.contains("nested folder /distribution/bwc/minor/build/bwc/checkout-8.x/" +
117+
result.output.contains("nested folder /distribution/bwc/major1/build/bwc/checkout-8.x/" +
118118
"distribution/archives/darwin-tar/build/install/elasticsearch-8.4.0-SNAPSHOT")
119119
}
120120

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class InternalDistributionDownloadPluginFuncTest extends AbstractGradleFuncTest
5151
def "resolves expanded bwc versions from source"() {
5252
given:
5353
internalBuild()
54-
bwcMinorProjectSetup()
54+
bwcMajor1ProjectSetup()
5555
buildFile << """
5656
apply plugin: 'elasticsearch.internal-distribution-download'
5757
@@ -72,16 +72,16 @@ class InternalDistributionDownloadPluginFuncTest extends AbstractGradleFuncTest
7272

7373
def result = gradleRunner("setupDistro").build()
7474
then:
75-
result.task(":distribution:bwc:minor:buildBwcExpandedTask").outcome == TaskOutcome.SUCCESS
75+
result.task(":distribution:bwc:major1:buildBwcExpandedTask").outcome == TaskOutcome.SUCCESS
7676
result.task(":setupDistro").outcome == TaskOutcome.SUCCESS
77-
assertExtractedDistroIsCreated("distribution/bwc/minor/build/install/elastic-distro",
77+
assertExtractedDistroIsCreated("distribution/bwc/major1/build/install/elastic-distro",
7878
'bwc-marker.txt')
7979
}
8080

8181
def "fails on resolving bwc versions with no bundled jdk"() {
8282
given:
8383
internalBuild()
84-
bwcMinorProjectSetup()
84+
bwcMajor1ProjectSetup()
8585
buildFile << """
8686
apply plugin: 'elasticsearch.internal-distribution-download'
8787
@@ -105,12 +105,12 @@ class InternalDistributionDownloadPluginFuncTest extends AbstractGradleFuncTest
105105
"without a bundled JDK is not supported.")
106106
}
107107

108-
private void bwcMinorProjectSetup() {
108+
private void bwcMajor1ProjectSetup() {
109109
settingsFile << """
110-
include ':distribution:bwc:minor'
110+
include ':distribution:bwc:major1'
111111
"""
112-
def bwcSubProjectFolder = testProjectDir.newFolder("distribution", "bwc", "minor")
113-
new File(bwcSubProjectFolder, 'bwc-marker.txt') << "bwc=minor"
112+
def bwcSubProjectFolder = testProjectDir.newFolder("distribution", "bwc", "major1")
113+
new File(bwcSubProjectFolder, 'bwc-marker.txt') << "bwc=major1"
114114
new File(bwcSubProjectFolder, 'build.gradle') << """
115115
apply plugin:'base'
116116

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
4040
given:
4141
internalBuild()
4242

43-
subProject(":distribution:bwc:minor") << """
43+
subProject(":distribution:bwc:major1") << """
4444
configurations { checkout }
4545
artifacts {
4646
checkout(new File(projectDir, "checkoutDir"))
@@ -61,11 +61,11 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
6161
result.task(transformTask).outcome == TaskOutcome.NO_SOURCE
6262
}
6363

64-
def "yamlRestCompatTest executes and copies api and transforms tests from :bwc:minor"() {
64+
def "yamlRestCompatTest executes and copies api and transforms tests from :bwc:major1"() {
6565
given:
6666
internalBuild()
6767

68-
subProject(":distribution:bwc:minor") << """
68+
subProject(":distribution:bwc:major1") << """
6969
configurations { checkout }
7070
artifacts {
7171
checkout(new File(projectDir, "checkoutDir"))
@@ -98,8 +98,8 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
9898
String api = "foo.json"
9999
String test = "10_basic.yml"
100100
//add the compatible test and api files, these are the prior version's normal yaml rest tests
101-
file("distribution/bwc/minor/checkoutDir/rest-api-spec/src/main/resources/rest-api-spec/api/" + api) << ""
102-
file("distribution/bwc/minor/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/" + test) << ""
101+
file("distribution/bwc/major1/checkoutDir/rest-api-spec/src/main/resources/rest-api-spec/api/" + api) << ""
102+
file("distribution/bwc/major1/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/" + test) << ""
103103

104104
when:
105105
def result = gradleRunner("yamlRestCompatTest").build()
@@ -145,7 +145,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
145145
given:
146146
internalBuild()
147147
withVersionCatalogue()
148-
subProject(":distribution:bwc:minor") << """
148+
subProject(":distribution:bwc:major1") << """
149149
configurations { checkout }
150150
artifacts {
151151
checkout(new File(projectDir, "checkoutDir"))
@@ -186,7 +186,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
186186
given:
187187
internalBuild()
188188

189-
subProject(":distribution:bwc:minor") << """
189+
subProject(":distribution:bwc:major1") << """
190190
configurations { checkout }
191191
artifacts {
192192
checkout(new File(projectDir, "checkoutDir"))
@@ -230,7 +230,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
230230

231231
setupRestResources([], [])
232232

233-
file("distribution/bwc/minor/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/test.yml" ) << """
233+
file("distribution/bwc/major1/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/test.yml" ) << """
234234
"one":
235235
- do:
236236
do_.some.key_to_replace:

‎build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
rootProject.name = "root"
1111

12-
include ":distribution:bwc:bugfix"
13-
include ":distribution:bwc:bugfix2"
14-
include ":distribution:bwc:bugfix3"
15-
include ":distribution:bwc:minor"
16-
include ":distribution:bwc:major"
17-
include ":distribution:bwc:staged"
18-
include ":distribution:bwc:staged2"
19-
include ":distribution:bwc:maintenance"
12+
include ":distribution:bwc:major1"
13+
include ":distribution:bwc:major2"
14+
include ":distribution:bwc:major3"
15+
include ":distribution:bwc:major4"
16+
include ":distribution:bwc:minor1"
17+
include ":distribution:bwc:minor2"
18+
include ":distribution:bwc:minor3"
19+
include ":distribution:bwc:minor4"
2020
include ":distribution:archives:darwin-tar"
2121
include ":distribution:archives:oss-darwin-tar"
2222
include ":distribution:archives:darwin-aarch64-tar"

‎build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,22 @@
99

1010
package org.elasticsearch.gradle.fixtures
1111

12+
import spock.lang.Specification
13+
import spock.lang.TempDir
14+
1215
import org.apache.commons.io.FileUtils
1316
import org.apache.commons.io.IOUtils
1417
import org.elasticsearch.gradle.internal.test.BuildConfigurationAwareGradleRunner
1518
import org.elasticsearch.gradle.internal.test.InternalAwareGradleRunner
1619
import org.elasticsearch.gradle.internal.test.NormalizeOutputGradleRunner
1720
import org.elasticsearch.gradle.internal.test.TestResultExtension
18-
import org.gradle.internal.component.external.model.ComponentVariant
1921
import org.gradle.testkit.runner.BuildResult
2022
import org.gradle.testkit.runner.GradleRunner
2123
import org.junit.Rule
2224
import org.junit.rules.TemporaryFolder
23-
import spock.lang.Specification
24-
import spock.lang.TempDir
2525

2626
import java.lang.management.ManagementFactory
2727
import java.nio.charset.StandardCharsets
28-
import java.nio.file.Files
29-
import java.io.File
30-
import java.nio.file.Path
3128
import java.util.jar.JarEntry
3229
import java.util.jar.JarOutputStream
3330
import java.util.zip.ZipEntry
@@ -161,10 +158,10 @@ abstract class AbstractGradleFuncTest extends Specification {
161158
File internalBuild(
162159
List<String> extraPlugins = [],
163160
String maintenance = "7.16.10",
164-
String bugfix2 = "8.1.3",
165-
String bugfix = "8.2.1",
166-
String staged = "8.3.0",
167-
String minor = "8.4.0",
161+
String major4 = "8.1.3",
162+
String major3 = "8.2.1",
163+
String major2 = "8.3.0",
164+
String major1 = "8.4.0",
168165
String current = "9.0.0"
169166
) {
170167
buildFile << """plugins {
@@ -174,31 +171,31 @@ abstract class AbstractGradleFuncTest extends Specification {
174171
import org.elasticsearch.gradle.Architecture
175172
176173
import org.elasticsearch.gradle.internal.BwcVersions
174+
import org.elasticsearch.gradle.internal.info.DevelopmentBranch
177175
import org.elasticsearch.gradle.Version
178176
179177
Version currentVersion = Version.fromString("${current}")
180178
def versionList = [
181179
Version.fromString("$maintenance"),
182-
Version.fromString("$bugfix2"),
183-
Version.fromString("$bugfix"),
184-
Version.fromString("$staged"),
185-
Version.fromString("$minor"),
180+
Version.fromString("$major4"),
181+
Version.fromString("$major3"),
182+
Version.fromString("$major2"),
183+
Version.fromString("$major1"),
186184
currentVersion
187185
]
188186
189-
BwcVersions versions = new BwcVersions(currentVersion, versionList, ['main', '8.x', '8.3', '8.2', '8.1', '7.16'])
190-
buildParams.setBwcVersions(project.provider { versions} )
187+
BwcVersions versions = new BwcVersions(currentVersion, versionList, [
188+
new DevelopmentBranch('main', Version.fromString("$current")),
189+
new DevelopmentBranch('8.x', Version.fromString("$major1")),
190+
new DevelopmentBranch('8.3', Version.fromString("$major2")),
191+
new DevelopmentBranch('8.2', Version.fromString("$major3")),
192+
new DevelopmentBranch('8.1', Version.fromString("$major4")),
193+
new DevelopmentBranch('7.16', Version.fromString("$maintenance")),
194+
])
195+
buildParams.setBwcVersions(project.provider { versions } )
191196
"""
192197
}
193198

194-
void setupLocalGitRepo() {
195-
execute("git init")
196-
execute('git config user.email "build-tool@elastic.co"')
197-
execute('git config user.name "Build tool"')
198-
execute("git add .")
199-
execute('git commit -m "Initial"')
200-
}
201-
202199
void execute(String command, File workingDir = testProjectDir.root) {
203200
def proc = command.execute(Collections.emptyList(), workingDir)
204201
proc.waitFor()

‎build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,14 @@ allprojects {
325325
resolveJavaToolChain = true
326326

327327
// ensure we have best possible caching of bwc builds
328-
dependsOn ":distribution:bwc:bugfix:buildBwcLinuxTar"
329-
dependsOn ":distribution:bwc:bugfix2:buildBwcLinuxTar"
330-
dependsOn ":distribution:bwc:bugfix3:buildBwcLinuxTar"
331-
dependsOn ":distribution:bwc:minor:buildBwcLinuxTar"
332-
dependsOn ":distribution:bwc:staged:buildBwcLinuxTar"
333-
dependsOn ":distribution:bwc:staged2:buildBwcLinuxTar"
328+
dependsOn ":distribution:bwc:major1:buildBwcLinuxTar"
329+
dependsOn ":distribution:bwc:major2:buildBwcLinuxTar"
330+
dependsOn ":distribution:bwc:major3:buildBwcLinuxTar"
331+
dependsOn ":distribution:bwc:major4:buildBwcLinuxTar"
332+
dependsOn ":distribution:bwc:minor1:buildBwcLinuxTar"
333+
dependsOn ":distribution:bwc:minor2:buildBwcLinuxTar"
334+
dependsOn ":distribution:bwc:minor3:buildBwcLinuxTar"
335+
dependsOn ":distribution:bwc:minor4:buildBwcLinuxTar"
334336
}
335337
if (project.path.contains("fixture")) {
336338
dependsOn tasks.withType(ComposePull)

0 commit comments

Comments
 (0)