Bug 566441 - [Mac] Update Mac tests to use dmg

Change-Id: I0ff063f174a73bf222b885c2ac33fec6b2b8ffe3
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

4 files changed, 17 insertions, 12 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
index 34f8cc2d4..f006b3bb9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
@@ -3,11 +3,11 @@
 
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.dmg
 
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.17-linux-gtk-x86_64.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.17-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.17-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.17-macosx-cocoa-x86_64.dmg
 
 org.eclipse.equinox.p2.tests.current.build.repo=http\://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
 org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800/
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtestsmac.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtestsmac.sh
index e73380ad7..ad2ba5518 100755
--- a/production/testScripts/configuration/sdk.tests/testScripts/runtestsmac.sh
+++ b/production/testScripts/configuration/sdk.tests/testScripts/runtestsmac.sh
@@ -104,7 +104,12 @@ ECLIPSE_HOME=Eclipse.app/Contents/Eclipse
 
 if [[ ! -r "${ECLIPSE_HOME}" ]]
 then
-  tar -xzf eclipse-SDK-*.tar.gz
+  hdiutil attach eclipse-SDK-*.dmg
+  cp -r /Volumes/Eclipse/Eclipse.app .
+  hdiutil detach /Volumes/Eclipse
+  xattr -rc Eclipse.app
+  
+  #tar -xzf eclipse-SDK-*.tar.gz
   # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos.
   unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d "${ECLIPSE_HOME}/dropins"
 fi
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index dcd05577b..31f9f2386 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -179,7 +179,7 @@
 
     <condition
       property="platformArchive"
-      value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.tar.gz">
+      value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.dmg">
       <and>
         <os family="mac" />
         <os family="unix" />
@@ -191,7 +191,7 @@
     </condition>
     <condition
       property="platformArchive"
-      value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa.tar.gz">
+      value="eclipse-platform-${previousReleaseVersion}-macosx-cocoa.dmg">
       <and>
         <os family="mac" />
         <os family="unix" />
@@ -986,7 +986,7 @@
     </condition>
     <condition
       property="runtimeArchive"
-      value="eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.tar.gz">
+      value="eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.dmg">
       <and>
         <equals
           arg1="${os}"
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index de56c421d..46e6f884a 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -174,16 +174,16 @@
     unless="skipInstall">
     <get
       verbose="${selectiveVerbose}"
-      src="${archiveLocation}/eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.tar.gz"
-      dest="${executionDir}/eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.tar.gz" />
+      src="${archiveLocation}/eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.dmg"
+      dest="${executionDir}/eclipse-SDK-${buildIdToUse}-macosx-cocoa-x86_64.dmg" />
     <get
       verbose="${selectiveVerbose}"
-      src="${archiveLocation}/eclipse-platform-${buildIdToUse}-macosx-cocoa-x86_64.tar.gz"
-      dest="${executionDir}/eclipse-platform-${buildIdToUse}-macosx-cocoa-x86_64.tar.gz" />
+      src="${archiveLocation}/eclipse-platform-${buildIdToUse}-macosx-cocoa-x86_64.dmg"
+      dest="${executionDir}/eclipse-platform-${buildIdToUse}-macosx-cocoa-x86_64.dmg" />
     <get
       verbose="${selectiveVerbose}"
-      src="${previousReleaseLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.tar.gz"
-      dest="${platformLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.tar.gz" />
+      src="${previousReleaseLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.dmg"
+      dest="${platformLocation}/eclipse-platform-${previousReleaseVersion}-macosx-cocoa-x86_64.dmg" />
   </target>
 
   <target