Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2020-08-05 06:04:19 -0400
committerAlexander Kurtakov2020-08-05 06:04:19 -0400
commit58a49ab58a3ac13c87f4b639d4174e848463718d (patch)
tree3ab490455c1504a779b1780ad6323e8c1365dab8
parenta0937fa09a981d1c303767558e6e6bcf02fb4115 (diff)
downloadeclipse.platform.releng.aggregator-58a49ab58a3ac13c87f4b639d4174e848463718d.tar.gz
eclipse.platform.releng.aggregator-58a49ab58a3ac13c87f4b639d4174e848463718d.tar.xz
eclipse.platform.releng.aggregator-58a49ab58a3ac13c87f4b639d4174e848463718d.zip
Bug 565419 - Add Linux aarch64 build
Publish Linux AArch 64 bits. Prepare tests to run on aarch64. Change-Id: I6d2ff93f01fe16e675a81276823dfb48fc322130 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml12
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml1
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml5
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties3
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml23
-rw-r--r--production/testScripts/runTests2.xml6
6 files changed, 50 insertions, 0 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
index eb43f5d10..c4d475d09 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
@@ -15,6 +15,10 @@
name="Linux (64 bit version for Power PC)"
fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform>
<platform
+ id="SLG2AARCH64"
+ name="Linux (64 bit version for AArch64)"
+ fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-aarch64.tar.gz"></platform>
+ <platform
id="SMCC64"
name="Mac OSX (64 bit version)"
fileName="eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg"></platform>
@@ -77,6 +81,10 @@
name="Linux (64 bit version for Power PC)"
fileName="eclipse-platform-${BUILD_ID}-linux-gtk-ppc64le.tar.gz"></platform>
<platform
+ id="PLG2AARCH64"
+ name="Linux (64 bit version for AArch64)"
+ fileName="eclipse-platform-${BUILD_ID}-linux-gtk-aarch64.tar.gz"></platform>
+ <platform
id="PMCC64"
name="Mac OSX (64 bit version)"
fileName="eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg"></platform>
@@ -157,6 +165,10 @@
name="Linux (64 bit version for Power PC)"
fileName="swt-${BUILD_ID}-gtk-linux-ppc64le.zip"></platform>
<platform
+ id="SWTLG2AARCH64"
+ name="Linux (64 bit version for AArch64)"
+ fileName="swt-${BUILD_ID}-gtk-linux-aarch64.zip"></platform>
+ <platform
id="SWTMCC64"
name="Mac OSX (64 bit version)"
fileName="swt-${BUILD_ID}-cocoa-macosx-x86_64.zip"></platform>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
index da6739c62..5d0bb59cc 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
@@ -16,6 +16,7 @@
<buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />
<buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
<buildRepos os="linux" ws="gtk" arch="ppc64le" archiveName="${archiveRoot}-linux.gtk.ppc64le.${buildId}.tar.gz" />
+ <buildRepos os="linux" ws="gtk" arch="aarch64" archiveName="${archiveRoot}-linux.gtk.aarch64.${buildId}.tar.gz" />
<buildRepos os="macosx" ws="cocoa" arch="x86_64" archiveName="${archiveRoot}-macosx.cocoa.x86_64.${buildId}.tar.gz" />
</target>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
index 8293db20b..e82f6b250 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
@@ -258,6 +258,11 @@
fileName="launchers-linux.gtk.ppc64le.${BUILD_ID}.tar.gz" />
<platform
format="equinox"
+ id="SLG2AARCH64"
+ name="Linux (AARCH64/GTK+)"
+ fileName="launchers-linux.gtk.aarch64.${BUILD_ID}.tar.gz" />
+ <platform
+ format="equinox"
id="SMCC64"
name="Mac OSX (Mac/Cocoa/x86_64)"
fileName="launchers-macosx.cocoa.x86_64.${BUILD_ID}.tar.gz" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 259a9a022..20e23d6b9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -32,6 +32,9 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
root.linux.gtk.ppc64le.permissions.755=eclipse
+root.linux.gtk.aarch64=rootfiles/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
+root.linux.gtk.aarch64.permissions.755=eclipse
+
root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
root.linux.gtk.x86_64.permissions.755=eclipse
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 63ca71f07..a005993ef 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -230,6 +230,14 @@
<os arch="ppc64le" />
</and>
</condition>
+ <condition
+ property="platformArchive"
+ value="eclipse-platform-${previousReleaseVersion}-linux-gtk-aarch64.tar.gz">
+ <and>
+ <os family="unix" />
+ <os arch="aarch64" />
+ </and>
+ </condition>
<fail
unless="platformArchive"
@@ -1011,6 +1019,21 @@
</condition>
<condition
property="runtimeArchive"
+ value="eclipse-SDK-${buildIdToUse}-linux-gtk-aarch64.tar.gz">
+ <and>
+ <equals
+ arg1="${os}"
+ arg2="linux" />
+ <equals
+ arg1="${ws}"
+ arg2="gtk" />
+ <equals
+ arg1="${arch}"
+ arg2="aarch64" />
+ </and>
+ </condition>
+ <condition
+ property="runtimeArchive"
value="eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.tar.gz">
<and>
<equals
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 8241e28bb..98c96f920 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -206,6 +206,9 @@
<equals
arg1="${osgi.arch}"
arg2="ppc64le" />
+ <equals
+ arg1="${osgi.arch}"
+ arg2="aarch64" />
</or>
<equals
arg1="${jvm.version}"
@@ -260,6 +263,9 @@
<equals
arg1="${osgi.arch}"
arg2="ppc64le" />
+ <equals
+ arg1="${osgi.arch}"
+ arg2="aarch64" />
</or>
</and>
</condition>

Back to the top