Skip to content

Commit 0e9f74e

Browse files
saratvemulapallisaratvemulapalli
authored
Renaming CPU architecture to have consistent naming (#612)
* Renaming CPU architecture from x86_64, aarch64 to x64, arm64 Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
1 parent c5a3c3c commit 0e9f74e

File tree

24 files changed

+102
-88
lines changed

24 files changed

+102
-88
lines changed

‎buildSrc/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ if (project != rootProject) {
185185
distribution project(':distribution:archives:windows-zip')
186186
distribution project(':distribution:archives:darwin-tar')
187187
distribution project(':distribution:archives:linux-tar')
188-
distribution project(':distribution:archives:linux-aarch64-tar')
188+
distribution project(':distribution:archives:linux-arm64-tar')
189189

190190
integTestRuntimeOnly(project(":libs:opensearch-core"))
191191
}

‎buildSrc/src/integTest/groovy/org/opensearch/gradle/DistributionDownloadPluginFuncTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
119119

120120
then:
121121
result.tasks.size() == 3
122-
result.output.count("Unpacking opensearch-${version}-linux-x86_64.tar.gz " +
122+
result.output.count("Unpacking opensearch-${version}-linux-x64.tar.gz " +
123123
"using SymbolicLinkPreservingUntarTransform.") == 1
124124
}
125125

‎buildSrc/src/integTest/groovy/org/opensearch/gradle/fixtures/DistributionDownloadFixture.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class DistributionDownloadFixture {
6565
private static String urlPath(String version, OpenSearchDistribution.Platform platform) {
6666
String fileType = ((platform == OpenSearchDistribution.Platform.LINUX ||
6767
platform == OpenSearchDistribution.Platform.DARWIN)) ? "tar.gz" : "zip"
68-
"/releases/core/opensearch/${version}/opensearch-${version}-${platform}-x86_64.$fileType"
68+
"/releases/core/opensearch/${version}/opensearch-${version}-${platform}-x64.$fileType"
6969
}
7070

7171
private static byte[] filebytes(String urlPath) throws IOException {

‎buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGradleFuncTest
102102
result.output.contains("[8.0.1] > Task :distribution:archives:darwin-tar:assemble")
103103
normalizedOutput(result.output)
104104
.contains("distfile /distribution/bwc/bugfix/build/bwc/checkout-8.0/distribution/archives/darwin-tar/" +
105-
"build/distributions/opensearch-8.0.1-SNAPSHOT-darwin-x86_64.tar.gz")
105+
"build/distributions/opensearch-8.0.1-SNAPSHOT-darwin-x64.tar.gz")
106106
}
107107

108108
def "bwc expanded distribution folder can be resolved as bwc project artifact"() {

‎buildSrc/src/integTest/resources/org/opensearch/gradle/internal/fake_git/remote/distribution/archives/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ subprojects {
3636
destinationDirectory.set(file('build/distributions'))
3737
archiveBaseName.set("opensearch")
3838
archiveVersion.set("8.0.1-SNAPSHOT")
39-
archiveClassifier.set("darwin-x86_64")
39+
archiveClassifier.set("darwin-x64")
4040
archiveExtension.set('tar.gz')
4141
}
4242

‎buildSrc/src/main/groovy/org/opensearch/gradle/test/ClusterFormationTasks.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ class ClusterFormationTasks {
206206

207207
Version version = Version.fromString(opensearchVersion)
208208
String os = getOs()
209-
String classifier = "-${os}-x86_64"
209+
String classifier = "-${os}-x64"
210210
String packaging = os.equals('windows') ? 'zip' : 'tar.gz'
211211
String artifactName = 'opensearch'
212212
Object dependency

‎buildSrc/src/main/java/org/opensearch/gradle/Architecture.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
public enum Architecture {
3636

3737
X64,
38-
AARCH64;
38+
ARM64;
3939

4040
public static Architecture current() {
4141
final String architecture = System.getProperty("os.arch", "");
@@ -44,7 +44,7 @@ public static Architecture current() {
4444
case "x86_64":
4545
return X64;
4646
case "aarch64":
47-
return AARCH64;
47+
return ARM64;
4848
default:
4949
throw new IllegalArgumentException("can not determine architecture from [" + architecture + "]");
5050
}

‎buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@ private String dependencyNotation(OpenSearchDistribution distribution) {
187187

188188
Version distroVersion = Version.fromString(distribution.getVersion());
189189
String extension = distribution.getType().toString();
190-
String classifier = ":x86_64";
190+
String classifier = ":x64";
191191
if (distribution.getType() == Type.ARCHIVE) {
192192
extension = distribution.getPlatform() == Platform.WINDOWS ? "zip" : "tar.gz";
193193
if (distroVersion.onOrAfter("7.0.0")) {
194-
classifier = ":" + distribution.getPlatform() + "-x86_64";
194+
classifier = ":" + distribution.getPlatform() + "-x64";
195195
} else {
196196
classifier = "";
197197
}

‎buildSrc/src/main/java/org/opensearch/gradle/Jdk.java

+10-2
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,10 @@ public String getArchitecture() {
120120
}
121121

122122
public void setArchitecture(final String architecture) {
123-
if (ALLOWED_ARCHITECTURES.contains(architecture) == false) {
123+
String jdkArchitecture = translateJdkArchitecture(architecture);
124+
if (ALLOWED_ARCHITECTURES.contains(jdkArchitecture) == false) {
124125
throw new IllegalArgumentException(
125-
"unknown architecture [" + architecture + "] for jdk [" + name + "], must be one of " + ALLOWED_ARCHITECTURES
126+
"unknown architecture [" + jdkArchitecture + "] for jdk [" + name + "], must be one of " + ALLOWED_ARCHITECTURES
126127
);
127128
}
128129
this.architecture.set(architecture);
@@ -229,4 +230,11 @@ private void parseVersion(String version) {
229230
hash = jdkVersionMatcher.group(5);
230231
}
231232

233+
private String translateJdkArchitecture(String architecture) {
234+
/*
235+
* Jdk uses aarch64 from ARM. Translating from arm64 to aarch64 which Jdk understands.
236+
*/
237+
return architecture == "arm64" ? "aarch64" : architecture;
238+
}
239+
232240
}

‎buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private void registerDistributionArchiveArtifact(Project bwcProject, Distributio
135135
String artifactName = "opensearch";
136136

137137
String suffix = artifactFileName.endsWith("tar.gz") ? "tar.gz" : artifactFileName.substring(artifactFileName.length() - 3);
138-
int archIndex = artifactFileName.indexOf("x86_64");
138+
int archIndex = artifactFileName.indexOf("x64");
139139

140140
bwcProject.getConfigurations().create(distributionProject.name);
141141
bwcProject.getArtifacts().add(distributionProject.name, distributionProject.getDistFile(), artifact -> {
@@ -146,7 +146,7 @@ private void registerDistributionArchiveArtifact(Project bwcProject, Distributio
146146
String classifier = "";
147147
if (archIndex != -1) {
148148
int osIndex = artifactFileName.lastIndexOf('-', archIndex - 2);
149-
classifier = "-" + artifactFileName.substring(osIndex + 1, archIndex - 1) + "-x86_64";
149+
classifier = "-" + artifactFileName.substring(osIndex + 1, archIndex - 1) + "-x64";
150150
}
151151
artifact.setClassifier(classifier);
152152
});
@@ -171,15 +171,15 @@ private static List<DistributionProject> resolveArchiveProjects(File checkoutDir
171171
if (name.contains("zip") || name.contains("tar")) {
172172
int index = name.lastIndexOf('-');
173173
String baseName = name.substring(0, index);
174-
classifier = "-" + baseName + "-x86_64";
174+
classifier = "-" + baseName + "-x64";
175175
extension = name.substring(index + 1);
176176
if (extension.equals("tar")) {
177177
extension += ".gz";
178178
}
179179
} else if (name.contains("deb")) {
180180
classifier = "-amd64";
181181
} else if (name.contains("rpm")) {
182-
classifier = "-x86_64";
182+
classifier = "-x64";
183183
}
184184
} else {
185185
extension = name.substring(4);

‎buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,8 @@ private List<OpenSearchDistribution> configureDistributions(Project project) {
381381
)) {
382382
for (boolean bundledJdk : Arrays.asList(true, false)) {
383383
if (bundledJdk == false) {
384-
// We'll never publish an ARM (aarch64) build without a bundled JDK.
385-
if (architecture == Architecture.AARCH64) {
384+
// We'll never publish an ARM (arm64) build without a bundled JDK.
385+
if (architecture == Architecture.ARM64) {
386386
continue;
387387
}
388388
// All our Docker images include a bundled JDK so it doesn't make sense to test without one.

‎distribution/archives/build.gradle

+15-15
Original file line numberDiff line numberDiff line change
@@ -89,51 +89,51 @@ distribution_archives {
8989
}
9090

9191
windowsZip {
92-
archiveClassifier = 'windows-x86_64'
92+
archiveClassifier = 'windows-x64'
9393
content {
94-
archiveFiles(modulesFiles('windows-x86_64'), 'zip', 'windows', 'x64', true)
94+
archiveFiles(modulesFiles('windows-x64'), 'zip', 'windows', 'x64', true)
9595
}
9696
}
9797

9898
noJdkWindowsZip {
99-
archiveClassifier = 'no-jdk-windows-x86_64'
99+
archiveClassifier = 'no-jdk-windows-x64'
100100
content {
101-
archiveFiles(modulesFiles('windows-x86_64'), 'zip', 'windows', 'x64', false)
101+
archiveFiles(modulesFiles('windows-x64'), 'zip', 'windows', 'x64', false)
102102
}
103103
}
104104

105105
darwinTar {
106-
archiveClassifier = 'darwin-x86_64'
106+
archiveClassifier = 'darwin-x64'
107107
content {
108-
archiveFiles(modulesFiles('darwin-x86_64'), 'tar', 'darwin', 'x64', true)
108+
archiveFiles(modulesFiles('darwin-x64'), 'tar', 'darwin', 'x64', true)
109109
}
110110
}
111111

112112
noJdkDarwinTar {
113-
archiveClassifier = 'no-jdk-darwin-x86_64'
113+
archiveClassifier = 'no-jdk-darwin-x64'
114114
content {
115-
archiveFiles(modulesFiles('darwin-x86_64'), 'tar', 'darwin', 'x64', false)
115+
archiveFiles(modulesFiles('darwin-x64'), 'tar', 'darwin', 'x64', false)
116116
}
117117
}
118118

119-
linuxAarch64Tar {
120-
archiveClassifier = 'linux-aarch64'
119+
linuxArm64Tar {
120+
archiveClassifier = 'linux-arm64'
121121
content {
122-
archiveFiles(modulesFiles('linux-aarch64'), 'tar', 'linux', 'aarch64', true)
122+
archiveFiles(modulesFiles('linux-arm64'), 'tar', 'linux', 'arm64', true)
123123
}
124124
}
125125

126126
linuxTar {
127-
archiveClassifier = 'linux-x86_64'
127+
archiveClassifier = 'linux-x64'
128128
content {
129-
archiveFiles(modulesFiles('linux-x86_64'), 'tar', 'linux', 'x64', true)
129+
archiveFiles(modulesFiles('linux-x64'), 'tar', 'linux', 'x64', true)
130130
}
131131
}
132132

133133
noJdkLinuxTar {
134-
archiveClassifier = 'no-jdk-linux-x86_64'
134+
archiveClassifier = 'no-jdk-linux-x64'
135135
content {
136-
archiveFiles(modulesFiles('linux-x86_64'), 'tar', 'linux', 'x64', false)
136+
archiveFiles(modulesFiles('linux-x64'), 'tar', 'linux', 'x64', false)
137137
}
138138
}
139139
}

‎distribution/archives/linux-aarch64-tar/build.gradle ‎distribution/archives/linux-arm64-tar/build.gradle

File renamed without changes.

‎distribution/build.gradle

+10-4
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
312312
modulesFiles = { platform ->
313313
copySpec {
314314
eachFile {
315-
if (it.relativePath.segments[-2] == 'bin' || (platform == 'darwin-x86_64' && it.relativePath.segments[-2] == 'MacOS')) {
315+
if (it.relativePath.segments[-2] == 'bin' || (platform == 'darwin-x64' && it.relativePath.segments[-2] == 'MacOS')) {
316316
// bin files, wherever they are within modules (eg platform specific) should be executable
317317
// and MacOS is an alternative to bin on macOS
318318
it.mode = 0755
@@ -321,7 +321,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
321321
}
322322
}
323323
def buildModules = buildModulesTaskProvider
324-
List excludePlatforms = ['linux-x86_64', 'linux-aarch64', 'windows-x86_64', 'darwin-x86_64']
324+
List excludePlatforms = ['linux-x64', 'linux-arm64', 'windows-x64', 'darwin-x64']
325325
if (platform != null) {
326326
excludePlatforms.remove(excludePlatforms.indexOf(platform))
327327
} else {
@@ -408,6 +408,12 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
408408

409409
jdkFiles = { Project project, String platform, String architecture ->
410410
return copySpec {
411+
/*
412+
* Jdk uses aarch64 from ARM. Translating from arm64 to aarch64 which Jdk understands.
413+
*/
414+
if ("arm64".equals(architecture)) {
415+
architecture = "aarch64"
416+
}
411417
from project.jdks."bundled_${platform}_${architecture}"
412418
exclude "demo/**"
413419
/*
@@ -585,11 +591,11 @@ subprojects {
585591

586592
['archives:windows-zip',
587593
'archives:darwin-tar',
588-
'archives:linux-aarch64-tar',
594+
'archives:linux-arm64-tar',
589595
'archives:linux-tar',
590596
'archives:integ-test-zip',
591597
'packages:rpm', 'packages:deb',
592-
'packages:aarch64-rpm', 'packages:aarch64-deb'
598+
'packages:arm64-rpm', 'packages:arm64-deb'
593599
].forEach { subName ->
594600
Project subproject = project("${project.path}:${subName}")
595601
Configuration configuration = configurations.create(subproject.name)

‎distribution/docker/build.gradle

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ apply plugin: 'opensearch.rest-resources'
2424
testFixtures.useFixture()
2525

2626
configurations {
27-
aarch64DockerSource
27+
arm64DockerSource
2828
dockerSource
2929
}
3030

3131
dependencies {
32-
aarch64DockerSource project(path: ":distribution:archives:linux-aarch64-tar", configuration:"default")
32+
arm64DockerSource project(path: ":distribution:archives:linux-arm64-tar", configuration:"default")
3333
dockerSource project(path: ":distribution:archives:linux-tar", configuration:"default")
3434
}
3535

3636
ext.expansions = { Architecture architecture, DockerBase base, boolean local ->
3737
String classifier
3838
if (local) {
39-
if (architecture == Architecture.AARCH64) {
40-
classifier = "linux-aarch64"
39+
if (architecture == Architecture.ARM64) {
40+
classifier = "linux-arm64"
4141
} else if (architecture == Architecture.X64) {
42-
classifier = "linux-x86_64"
42+
classifier = "linux-x64"
4343
} else {
4444
throw new IllegalArgumentException("Unsupported architecture [" + architecture + "]")
4545
}
@@ -82,13 +82,13 @@ RUN curl --retry 8 -S -L \\
8282

8383
private static String buildPath(Architecture architecture, DockerBase base) {
8484
return 'build/' +
85-
(architecture == Architecture.AARCH64 ? 'aarch64-' : '') +
85+
(architecture == Architecture.ARM64 ? 'arm64-' : '') +
8686
'docker'
8787
}
8888

8989
private static String taskName(String prefix, Architecture architecture, DockerBase base, String suffix) {
9090
return prefix +
91-
(architecture == Architecture.AARCH64 ? 'Aarch64' : '') +
91+
(architecture == Architecture.ARM64 ? 'Arm64' : '') +
9292
suffix
9393
}
9494

@@ -123,8 +123,8 @@ void addCopyDockerContextTask(Architecture architecture, DockerBase base) {
123123

124124
with dockerBuildContext(architecture, base, true)
125125

126-
if (architecture == Architecture.AARCH64) {
127-
from configurations.aarch64DockerSource
126+
if (architecture == Architecture.ARM64) {
127+
from configurations.arm64DockerSource
128128
} else {
129129
from configurations.dockerSource
130130
}
@@ -142,7 +142,7 @@ def createAndSetWritable(Object... locations) {
142142

143143
opensearch_distributions {
144144
Architecture.values().each { eachArchitecture ->
145-
"docker${ eachArchitecture == Architecture.AARCH64 ? '_aarch64' : '' }" {
145+
"docker${ eachArchitecture == Architecture.ARM64 ? '_arm64' : '' }" {
146146
architecture = eachArchitecture
147147
type = 'docker'
148148
version = VersionProperties.getOpenSearch()
@@ -225,10 +225,10 @@ subprojects { Project subProject ->
225225
if (subProject.name.endsWith('-export')) {
226226
apply plugin: 'distribution'
227227

228-
final Architecture architecture = subProject.name.contains('aarch64-') ? Architecture.AARCH64 : Architecture.X64
228+
final Architecture architecture = subProject.name.contains('arm64-') ? Architecture.ARM64 : Architecture.X64
229229
final DockerBase base = DockerBase.CENTOS
230230

231-
final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
231+
final String arch = architecture == Architecture.ARM64 ? '-arm64' : ''
232232
final String extension = 'docker.tar'
233233
final String artifactName = "opensearch${arch}_test"
234234

‎distribution/docker/docker-aarch64-export/build.gradle ‎distribution/docker/docker-arm64-export/build.gradle

File renamed without changes.

‎distribution/packages/aarch64-deb/build.gradle ‎distribution/packages/arm64-deb/build.gradle

File renamed without changes.

‎distribution/packages/aarch64-rpm/build.gradle ‎distribution/packages/arm64-rpm/build.gradle

File renamed without changes.

0 commit comments

Comments
 (0)