Bug 470932 - remove delta pack during build (temp adjustment in tests)

5 files changed, 194 insertions, 19 deletions

diff --git a/production/testScripts/configuration/sdk.tests/testScripts/createDeltaPack.xml b/production/testScripts/configuration/sdk.tests/testScripts/createDeltaPack.xml
new file mode 100644
index 000000000..0cf9d4a29
--- /dev/null
+++ b/production/testScripts/configuration/sdk.tests/testScripts/createDeltaPack.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  name="equinox feature build"
+  default="build"
+  basedir=".">
+
+  <target name="init">
+
+    <fail unless="buildId" message="buildId must be passed into this script."/>
+    <fail unless="buildType" message="buildType must be passed into this script."/>
+    <fail unless="DOWNLOAD_HOST" message="DOWNLOAD_HOST must be passed into this script." />
+    <property name="buildRepo" value="http://${DOWNLOAD_HOST}/eclipse/updates/4.6-${buildType}-builds/${buildId}" />
+
+    <!-- Normally installDeltapack passed in by caller, but handey for local testing -->
+    <property name="installDeltapack" value="${basedir}/test-eclipse/deltapack"/>
+
+    <property
+      name="featureTemp"
+      value="${basedir}/featureTemp" />
+  </target>
+
+  <target
+    name="build"
+    depends="init"
+    unless="deltaPackInstalled">
+
+
+    <echo message="DEBUG: echoproperties at beginning of deltapack (after init)" />
+    <echoproperties />
+    <delete
+      verbose="true"
+      dir="${featureTemp}" />
+    <mkdir dir="${featureTemp}" />
+    <delete
+      verbose="true"
+      dir="${installDeltapack}" />
+    <mkdir dir="${installDeltapack}" />
+    
+    <p2.mirror
+      source="${buildRepo}"
+      log="${installDeltapack}/deltapackmirrorlog.txt"
+      verbose="true"
+      ignoreerrors="true">
+      <destination
+        kind="metadata"
+        location="file://${featureTemp}"
+        name="RCP Delta Pack Repo"
+        format="${buildRepo}" />
+      <destination
+        kind="artifact"
+        location="file://${featureTemp}"
+        name="RCP Delta Pack Repo"
+        format="${buildRepo}" />
+      <iu
+        id="org.eclipse.platform.feature.group"
+        version="" />
+      <iu
+        id="org.eclipse.platform.source.feature.group"
+        version="" />
+      <iu
+        id="org.eclipse.rcp.feature.group"
+        version="" />
+      <iu
+        id="org.eclipse.rcp.source.feature.group"
+        version="" />
+      <iu
+        id="org.eclipse.jdt.feature.group"
+        version="" />
+      <iu
+        id="org.eclipse.jdt.source.feature.group"
+        version="" />
+      <iu
+        id="org.eclipse.rcp.configuration.feature.group"
+        version="" />
+
+      <iu
+        id="org.eclipse.equinox.executable"
+        version="" />
+      <iu
+        id="org.eclipse.e4.rcp.feature.group"
+        version="" />
+      <iu
+        id="org.eclipse.e4.rcp.source.feature.group"
+        version="" />
+      <slicingOptions
+        includeOptional="false"
+        includeNonGreedy="false"
+        followStrict="true"
+        followOnlyFilteredRequirements="true"
+        latestVersionOnly="true"/>
+    </p2.mirror>
+    <p2.remove.iu>
+      <repository location="file://${featureTemp}" />
+      <iu id="org.eclipse.jdt.feature.jar" />
+      <iu id="org.eclipse.jdt.source.feature.jar" />
+      <iu id="org.eclipse.platform.feature.jar" />
+      <iu id="org.eclipse.platform.source.feature.jar" />
+      <iu id="org.eclipse.rcp.feature.jar" />
+      <iu id="org.eclipse.rcp.source.feature.jar" />
+      <iu id="org.eclipse.e4.rcp.feature.jar" />
+      <iu id="org.eclipse.e4.rcp.source.feature.jar" />
+    </p2.remove.iu>
+    <p2.repo2runnable
+      destination="file://${installDeltapack}/eclipse"
+      failonerror="true">
+        <source>
+           <repository location="file://${featureTemp}" />
+        </source>
+    </p2.repo2runnable>
+    <delete verbose="true">
+      <fileset
+        dir="${installDeltapack}/eclipse"
+        includes="*.jar" />
+      <fileset
+        dir="${installDeltapack}/eclipse"
+        includes="*.xml" />
+    </delete>
+
+  </target>
+
+
+</project>
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runAntRunner.sh b/production/testScripts/configuration/sdk.tests/testScripts/runAntRunner.sh
new file mode 100644
index 000000000..67c4a4967
--- /dev/null
+++ b/production/testScripts/configuration/sdk.tests/testScripts/runAntRunner.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+# Utility to invoke eclipse antrunner, from Eclipse platform, which must already be
+# installed.
+
+# This script here in "testScripts" is not used during the build or testing, but is 
+# handy to have nearby to test things like "createDeltaPack.xml". 
+
+bash_script=${0##*/}
+
+BUILDFILE=$1
+if [ -e $BUILDFILE ]
+then
+  BUILDFILESTR=" -file $BUILDFILE"
+  shift
+else
+  BUILDFILESTR=" -file build.xml"
+fi
+
+# use special $@ to keep all (remaining) arguments quoted (instead of one big string)
+# they are passed through to the antrunner via -vmargs. 
+
+extraArgs="$@"
+
+echo
+echo " BUILDFILESTR: $BUILDFILESTR"
+if [ -n "${extraArgs}" ]
+then
+  echo "   extraArgs: ${extraArgs}"
+  echo "      as it is right now, target name must be first \"extraArg\" if specifying one."
+fi
+echo
+
+APP_NAME=org.eclipse.ant.core.antRunner
+
+devworkspace="${PWD}/workspace-antRunner"
+
+echo
+echo "   buildId:           ${buildId}"
+echo "   buildType:         ${buildType}"
+echo "   script:            ${bash_script}"
+echo "   devworkspace:      $devworkspace"
+echo "   APP_NAME:          $APP_NAME"
+echo "   BUILDFILESTR:      $BUILDFILESTR"
+echo "   extraArgs:         ${extraArgs}"
+echo
+export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
+JAVA_EXEC_DIR=${JAVA_HOME}/bin
+JAVA_CMD=${JAVA_EXEC_DIR}/java
+ECLIPSE_EXE=${PWD}/eclipse/eclipse
+echo
+$JAVA_CMD -version
+echo
+
+${ECLIPSE_EXE} -nosplash -consolelog -debug  -data ${devworkspace} -vm ${JAVA_EXEC_DIR}  -application ${APP_NAME} ${BUILDFILESTR} ${extraArgs}
+RC=$?
+
+exit $RC
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
index ba01d7c45..f1c388fd5 100755
--- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
+++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
@@ -194,6 +194,7 @@ echo
 echo "extdirprop in runtest.sh: ${extdirprop}"
 echo "extdirproperty in runtest.sh: ${extdirproperty}"
 echo "ANT_OPTS in runtests.sh: ${ANT_OPTS}"
+echo "DOWNLOAD_HOST: $DOWNLOAD_HOST"
 
 
 # -Dtimeout=300000 "${ANT_OPTS}"
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index fc6b20da6..5c84f86b0 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -1300,23 +1300,21 @@
 
   <target
     name="configureDeltaPack"
+    depends="init"
     if="pdebuild">
-    <property
-      name="deltapackArchive"
-      value="eclipse-${buildId}-delta-pack.zip" />
+
     <property
       name="installDeltapack"
       value="${install}/deltapack" />
-    <mkdir dir="${installDeltapack}" />
-    <exec
-      dir="."
-      executable="unzip">
-      <arg value="-o" />
-      <arg value="-qq" />
-      <arg value="${deltapackArchive}" />
-      <arg value="-d" />
-      <arg value="${installDeltapack}" />
-    </exec>
+    <available
+      file="${installDeltapack}"
+      property="deltaPackInstalled" />
+    <!--
+        createDeltaPack requires buildId, buildType, and DOWNLOAD_HOST, which is why they
+        are explicitly part of the "depends" list.
+    -->
+    <ant antfile="createDeltaPack.xml" taskname="createDeltaPack" />
+
   </target>
 
   <macrodef name="runTests">
@@ -1918,7 +1916,7 @@
     depends="init">
     <runTests testPlugin="org.eclipse.equinox.http.servlet.tests" />
   </target>
-  
+
   <target
     name="equinoxp2"
     depends="init">
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index a287997ae..6f60c8d59 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -144,11 +144,7 @@
       verbose="${selectiveVerbose}"
       src="${buildURL}/eclipse-Automated-Tests-${buildId}.zip"
       dest="${testDir}/eclipse-Automated-Tests-${buildId}.zip" />
-    <get
-      retries="5"
-      verbose="${selectiveVerbose}"
-      src="${archiveLocation}/eclipse-${buildIdToUse}-delta-pack.zip"
-      dest="${executionDir}/eclipse-${buildIdToUse}-delta-pack.zip" />
+
   </target>
 
   <target