Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcje-production/promotion/promoteSites.sh2
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/test.xml57
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh15
3 files changed, 1 insertions, 73 deletions
diff --git a/cje-production/promotion/promoteSites.sh b/cje-production/promotion/promoteSites.sh
index e2494dc4f..eaa4ac64c 100755
--- a/cje-production/promotion/promoteSites.sh
+++ b/cje-production/promotion/promoteSites.sh
@@ -202,7 +202,7 @@ function createBaseBuilder ()
-debug -consolelog -data ${WORKSPACE}/workspace-toolsinstall \
-application org.eclipse.equinox.p2.director \
-repository "https://download.eclipse.org/eclipse/updates/4.16/","https://download.eclipse.org/eclipse/updates/buildtools/","https://download.eclipse.org/webtools/downloads/drops/R3.17.0/R-3.17.0-20200306035042/repositoryunittests" \
- -installIU org.eclipse.platform.ide,org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.wtp.releng.tools.feature.feature.group,org.apache.derby.core.feature.feature.group \
+ -installIU org.eclipse.platform.ide,org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.wtp.releng.tools.feature.feature.group \
-destination ${BASEBUILDER_DIR} \
-profile SDKProfile
popd
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index a005993ef..dcd05577b 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -427,54 +427,6 @@
<arg value="file:${repoLocation}" />
</java>
- <antcall target="installderby" />
- </target>
-
- <target
- name="installderby"
- if="derby"
- unless="skipDerby">
- <!-- use p2director, not dropins -->
- <property
- name="perfrepoLocation"
- value="https://download.eclipse.org/eclipse/updates/buildtools/" />
-
- <java
- jar="${launcherPath}"
- failonerror="true"
- dir="${eclipse-home}"
- timeout="900000"
- fork="true"
- output="${directorLogs}/director-${derby}.log"
- append="true"
- resultproperty="directorcode">
- <arg value="-vm" />
- <arg path="${java.home}/bin/java" />
- <arg value="-application" />
- <arg value="org.eclipse.equinox.p2.director" />
- <arg value="-consoleLog" />
- <arg value="-debug" />
- <arg value="-flavor" />
- <arg value="tooling" />
- <arg value="-installIUs" />
- <arg value="${derby}" />
- <arg value="-p2.os" />
- <arg value="${os}" />
- <arg value="-p2.ws" />
- <arg value="${ws}" />
- <arg value="-p2.arch" />
- <arg value="${arch}" />
- <arg value="-roaming" />
- <arg value="-profile" />
- <arg value="SDKProfile" />
- <arg value="-repository" />
- <arg value="${perfrepoLocation}" />
- <arg value="-destination" />
- <arg path="${eclipse-home}" />
- <arg value="-bundlepool" />
- <arg path="${eclipse-home}" />
- </java>
-
</target>
<target
@@ -1507,15 +1459,6 @@
<echo message="test.target in 'runTests': ${test.target}" />
- <!--install db plug-ins if running performance tests -->
- <condition
- property="derby"
- value="org.apache.derby.core.feature.feature.group">
- <equals
- arg1="${test.target}"
- arg2="performance" />
- </condition>
- <!-- <property name="derby" value="" /> -->
<!-- <param name="testPlugin" value="${@{testPlugin}}" /> -->
<antcall target="${test.target}">
<param
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index a7a2e7ce9..0f263a12e 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -194,13 +194,11 @@ if [[ $JOB_NAME =~ $perfJobPattern && ! $JOB_NAME =~ $perfBaselineJobPattern ]]
then
# We run the "performance analysis" tools only on "current" build, for jobs that contain -perf- (and do not contain -baseline)
- devworkspace="${fromDir}/workspace-installDerbyCore"
devArgs="-Xmx512m"
echo "Collected a performance run result. Doing performance analysis for $JOB_NAME"
echo
- echo " = = Properties in updateTestResultsPages.sh: update derby section = = "
echo " dev script: $0"
echo " buildRoot: $buildRoot"
echo " BUILD_HOME: ${BUILD_HOME}"
@@ -213,20 +211,7 @@ then
echo " JOB_NAME: $JOB_NAME"
echo " JOB_NUMBER: $JOB_NUMBER"
echo
- echo " = = First, installing derby"
- # make sure derby.core is installed in basebuilder
- perfrepoLocation=https://download.eclipse.org/eclipse/updates/buildtools/
- derby=org.apache.derby.core.feature.feature.group
echo " perfrepoLocation: $perfrepoLocation"
- echo " derby: $derby"
-
- ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.equinox.p2.director -repository ${perfrepoLocation} -installIUs ${derby} -vm $devJRE -vmargs $devArgs
- RC=$?
- if [[ $RC != 0 ]]
- then
- echo "ERROR: eclipse returned non-zero return code while installing derby, exiting with RC: $RC."
- exit $RC
- fi
echo " = = Now run performance.ui app = ="
devworkspace="${fromDir}/workspace-updatePerfResults"

Back to the top