Skip to content

Commit d7364b1

Browse files
HannesWellHannesWell
committed
[I-Build-Tests] Unify archive name computation and make it less static
1 parent 9e04f87 commit d7364b1

File tree

1 file changed

+20
-149
lines changed
  • production/testScripts/configuration/sdk.tests/testScripts

1 file changed

+20
-149
lines changed

‎production/testScripts/configuration/sdk.tests/testScripts/test.xml‎

Lines changed: 20 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -215,92 +215,6 @@
215215

216216
</target>
217217

218-
<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
219-
<target
220-
name="initPlatformArhiveName"
221-
unless="platformArchive">
222-
<echo message="os.arch ${os.arch}" />
223-
224-
<condition
225-
property="platformArchive"
226-
value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.dmg">
227-
<and>
228-
<os family="mac" />
229-
<os family="unix" />
230-
<or>
231-
<os arch="x86_64" />
232-
<os arch="amd64" />
233-
</or>
234-
</and>
235-
</condition>
236-
<condition
237-
property="platformArchive"
238-
value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa-aarch64.dmg">
239-
<and>
240-
<os family="mac" />
241-
<os family="unix" />
242-
<or>
243-
<os arch="aarch64" />
244-
<os arch="arm64" />
245-
<os arch="arm64e" />
246-
</or>
247-
</and>
248-
</condition>
249-
<condition
250-
property="platformArchive"
251-
value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa.dmg">
252-
<and>
253-
<os family="mac" />
254-
<os family="unix" />
255-
<!-- should not need, as long as x86_64 rules (above) comes first
256-
<os arch="i386" />
257-
-->
258-
</and>
259-
</condition>
260-
<condition
261-
property="platformArchive"
262-
value="eclipse-platform-${previousReleaseVersion}-win32-x86_64.zip">
263-
<and>
264-
<os family="windows" />
265-
<or>
266-
<os arch="x86_64" />
267-
<os arch="amd64" />
268-
</or>
269-
</and>
270-
</condition>
271-
<condition
272-
property="platformArchive"
273-
value="eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz">
274-
<and>
275-
<os family="unix" />
276-
<or>
277-
<os arch="x86_64" />
278-
<os arch="amd64" />
279-
</or>
280-
</and>
281-
</condition>
282-
<condition
283-
property="platformArchive"
284-
value="eclipse-platform-${previousReleaseVersion}-linux-gtk-ppc64le.tar.gz">
285-
<and>
286-
<os family="unix" />
287-
<os arch="ppc64le" />
288-
</and>
289-
</condition>
290-
<condition
291-
property="platformArchive"
292-
value="eclipse-platform-${previousReleaseVersion}-linux-gtk-aarch64.tar.gz">
293-
<and>
294-
<os family="unix" />
295-
<os arch="aarch64" />
296-
</and>
297-
</condition>
298-
299-
<fail
300-
unless="platformArchive"
301-
message="platformArchive is not defined. Check that conditions cover os arch ${os.arch}. May be VM dependent.)" />
302-
303-
</target>
304218
<target name="setupPlatform">
305219
<condition
306220
property="platformTarget"
@@ -878,7 +792,7 @@
878792

879793
<target
880794
name="init"
881-
depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive"
795+
depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initOSes, initPlatformAndRuntimeArchiveName"
882796
unless="testingIsInitialized">
883797

884798
<property environment="env" />
@@ -990,7 +904,7 @@
990904
job.
991905
-->
992906
<target
993-
name="setRuntimeArchive"
907+
name="initPlatformAndRuntimeArchiveName"
994908
unless="runtimeArchive">
995909

996910
<condition
@@ -999,98 +913,55 @@
999913
else="${buildId}">
1000914
<istrue value="${baselinePerf}" />
1001915
</condition>
1002-
<echo message="setRuntimeArchive os ${os} ws ${ws} arch ${arch}" />
916+
<echo message="Set runtimeArchive and platformArchive for os: ${os}, ws: ${ws}, arch: ${arch}" />
1003917
<echo message="build id of runtimeArchive ${buildIdToUse}" />
1004918
<condition
1005-
property="runtimeArchive"
1006-
value="eclipse-SDK-${buildIdToUse}-win32-x86_64.zip">
919+
property="osArchiveNameSuffix"
920+
value="win32-${arch}.zip">
1007921
<and>
1008922
<equals
1009923
arg1="${os}"
1010924
arg2="win32" />
1011925
<equals
1012926
arg1="${ws}"
1013927
arg2="win32" />
1014-
<equals
1015-
arg1="${arch}"
1016-
arg2="x86_64" />
1017928
</and>
1018929
</condition>
1019930
<condition
1020-
property="runtimeArchive"
1021-
value="eclipse-SDK-${buildIdToUse}-linux-gtk-x86_64.tar.gz">
931+
property="osArchiveNameSuffix"
932+
value="linux-gtk-${arch}.tar.gz">
1022933
<and>
1023934
<equals
1024935
arg1="${os}"
1025936
arg2="linux" />
1026937
<equals
1027938
arg1="${ws}"
1028939
arg2="gtk" />
1029-
<equals
1030-
arg1="${arch}"
1031-
arg2="x86_64" />
1032940
</and>
1033941
</condition>
1034942
<condition
1035-
property="runtimeArchive"
1036-
value="eclipse-SDK-${buildIdToUse}-linux-gtk-ppc64le.tar.gz">
1037-
<and>
1038-
<equals
1039-
arg1="${os}"
1040-
arg2="linux" />
1041-
<equals
1042-
arg1="${ws}"
1043-
arg2="gtk" />
1044-
<equals
1045-
arg1="${arch}"
1046-
arg2="ppc64le" />
1047-
</and>
1048-
</condition>
1049-
<condition
1050-
property="runtimeArchive"
1051-
value="eclipse-SDK-${buildIdToUse}-linux-gtk-aarch64.tar.gz">
1052-
<and>
1053-
<equals
1054-
arg1="${os}"
1055-
arg2="linux" />
1056-
<equals
1057-
arg1="${ws}"
1058-
arg2="gtk" />
1059-
<equals
1060-
arg1="${arch}"
1061-
arg2="aarch64" />
1062-
</and>
1063-
</condition>
1064-
<condition
1065-
property="runtimeArchive"
1066-
value="eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.dmg">
1067-
<and>
1068-
<equals
1069-
arg1="${os}"
1070-
arg2="macosx" />
1071-
<equals
1072-
arg1="${ws}"
1073-
arg2="cocoa" />
1074-
<equals
1075-
arg1="${arch}"
1076-
arg2="x86_64" />
1077-
</and>
1078-
</condition>
1079-
<condition
1080-
property="runtimeArchive"
1081-
value="eclipse-SDK-${buildIdToUse}-macosx-cocoa-aarch64.dmg">
943+
property="osArchiveNameSuffix"
944+
value="macosx-cocoa-${arch}.dmg">
1082945
<and>
1083946
<equals
1084947
arg1="${os}"
1085948
arg2="macosx" />
1086949
<equals
1087950
arg1="${ws}"
1088951
arg2="cocoa" />
1089-
<equals
1090-
arg1="${arch}"
1091-
arg2="aarch64" />
1092952
</and>
1093953
</condition>
954+
<fail
955+
unless="osArchiveNameSuffix"
956+
message="osArchiveNameSuffix is not defined. Check that conditions cover os and ws: ${os} ${ws}" />
957+
<property
958+
name="runtimeArchive"
959+
value="eclipse-SDK-${buildIdToUse}-${osArchiveNameSuffix}"/>
960+
<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
961+
<property
962+
name="platformArchive"
963+
value="eclipse-platform-${previousReleaseVersion}-${osArchiveNameSuffix}"
964+
/>
1094965
<echo message="runtimeArchive ${runtimeArchive} !!! " />
1095966
</target>
1096967

0 commit comments

Comments
 (0)