Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2016-02-26 16:21:49 -0500
committerDavid Williams2016-02-26 16:21:49 -0500
commitccd2a0d84cd22df2ef19c1e909838a41d5392562 (patch)
tree0b6b25321077ab6ed0393b08a83fb6f03dc8eeea
parent5248888a40f7e157575572d4947b7bcabf6e201f (diff)
downloadeclipse.platform.releng.aggregator-ccd2a0d84cd22df2ef19c1e909838a41d5392562.tar.gz
eclipse.platform.releng.aggregator-ccd2a0d84cd22df2ef19c1e909838a41d5392562.tar.xz
eclipse.platform.releng.aggregator-ccd2a0d84cd22df2ef19c1e909838a41d5392562.zip
[releng] Update "previous release" related variables to 4.5.2.
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties12
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties2
-rwxr-xr-xeclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh2
-rwxr-xr-xeclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh2
-rwxr-xr-xproduction/build-functions.shsource8
-rw-r--r--production/sdk/miscTools/proxyRelated/getBaseBuilderAndTools.xml6
-rwxr-xr-xproduction/testScripts/configuration/sdk.tests/testScripts/runtests.sh2
-rw-r--r--production/testScripts/configuration/streamSpecific.properties10
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
9 files changed, 23 insertions, 23 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 3ecca0f0..e7317064 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
@@ -7,12 +7,12 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\\\ec
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.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.5.1-linux-gtk.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.5.1-win32.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.5.1-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.5.1-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.5.2-linux-gtk.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.5.2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.5.2-win32.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.5.2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.5.2-macosx-cocoa-x86_64.tar.gz
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.5/R-4.5.1-201509040015
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
index db63830e..d28ae541 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
@@ -5,4 +5,4 @@ buildId=${buildId}
# such as "4.5" instead of "4.5.0".
eclipseStream=${releaseNumberSDK}
# similar for previous release version
-previousReleaseVersion=4.5.1
+previousReleaseVersion=4.5.2
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
index 1a28dd1f..511d8cc8 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
@@ -7,7 +7,7 @@
mkdir -p workarea/${buildId}/eclipse-testing
#cp /home/files/buildzips/mars/SR0/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
-cp /home/files/buildzips/mars/SR0/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/mars/SR0/R-4.5.2-201602121500/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh
index 824b0cfe..aa93750e 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh
@@ -37,7 +37,7 @@ echo "jvm: $jvm"
# But, if running standalone, we'll assume "up two" from current directoy
WORKSPACE=${WORKSPACE:-"../../.."};
-stableEclipseSDK=${stableEclipseSDK:-eclipse-SDK-4.5.1-linux-gtk-x86_64.tar.gz}
+stableEclipseSDK=${stableEclipseSDK:-eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz}
stableEclipseInstallLocation=${stableEclipseInstallLocation:-${WORKSPACE}/org.eclipse.releng.basebuilder}
# Note: test.xml will "reinstall" fresh install of what we are testing,
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index e290a4da..6fbb1060 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1128,7 +1128,7 @@ fn-summarize-apitooling ()
# place, and not have to make further, hard-coded changes to testResults.php.template.
# Similar for freeze label.
# NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release".
- API_PREV_REF_LABEL=4.5.1
+ API_PREV_REF_LABEL=4.5.2
fn-write-property API_PREV_REF_LABEL
#API_FREEZE_REF_LABEL=4.5M6
API_FREEZE_REF_LABEL=" "
@@ -1143,9 +1143,9 @@ fn-summarize-apitooling ()
-DbuildId="$BUILD_ID" \
-DbuildLabel="$BUILD_ID" \
-DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \
- -DpreviousBaseURL=http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-win32.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.5.1 \
- -DpreviousBaselineFilename=eclipse-SDK-4.5.1-win32.zip \
+ -DpreviousBaseURL=http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-win32.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.5.2 \
+ -DpreviousBaselineFilename=eclipse-SDK-4.5.2-win32.zip \
-Djava.io.tmpdir=$TMP_DIR \
${FREEZE_PARAMS} \
apiToolsReports
diff --git a/production/sdk/miscTools/proxyRelated/getBaseBuilderAndTools.xml b/production/sdk/miscTools/proxyRelated/getBaseBuilderAndTools.xml
index 43014b5a..375a51c7 100644
--- a/production/sdk/miscTools/proxyRelated/getBaseBuilderAndTools.xml
+++ b/production/sdk/miscTools/proxyRelated/getBaseBuilderAndTools.xml
@@ -78,7 +78,7 @@
-->
<property
name="platformURL"
- value="http://${downloadHost}/eclipse/downloads/drops4/R-4.5.1-201509040015" />
+ value="http://${downloadHost}/eclipse/downloads/drops4/R-4.5.2-201602121500" />
<!--
We used to use binary platform, since smaller, but moved to SDK, to be able to use API Tools.
But then moved back to Platform, after having some cases where we need to pick up new fixes from
@@ -86,11 +86,11 @@
-->
<property
name="platformFile"
- value="eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz" />
+ value="eclipse-platform-4.5.2-linux-gtk-x86_64.tar.gz" />
<property
name="eclipserun-repo"
- value="http://download.eclipse.org/eclipse/updates/4.5/R-4.5.1-201509040015" />
+ value="http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500" />
<echo message="eclipserun-repo: ${eclipserun-repo}" />
<property
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
index 84da773a..ba01d7c4 100755
--- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
+++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
@@ -24,7 +24,7 @@ then
exit 1
fi
-stableEclipseSDK=${stableEclipseSDK:-eclipse-SDK-4.5.1-linux-gtk-x86_64.tar.gz}
+stableEclipseSDK=${stableEclipseSDK:-eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz}
stableEclipseInstallLocation=${stableEclipseInstallLocation:-${WORKSPACE}/org.eclipse.releng.basebuilder}
# Note: test.xml will "reinstall" fresh install of what we are testing,
# but we do need an install for initial launcher, and, later, need one for a
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 0c6b1741..97ed85f6 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,11 +11,11 @@ streamSpecificPropertiesTitle="Properties for 4.6.0 builds and tests"
# stable version of Eclipse, that is used, for example, for it's p2
# director, etc., so that "running the tests" is not actually using
# the "just built" versions.
-previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.5.1-201509040015
+previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.5.2-201602121500
# version here is "build label" ... in general form, the "middle" of archive name,
# such as "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz
# Also used used in p2 testing?
-previousReleaseVersion=4.5.1
+previousReleaseVersion=4.5.2
# This is last segment of last release repo, such as in
# http://${ARCHIVE_HOST}/eclipse/updates/${previousReleaseVersion}
# NOTE: I am assuming the "composite" repo is suitable for p2. In theory,
@@ -35,10 +35,10 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed
# or baselinePerfAlt=true
# are specified. The baselinePerf will often be the same as "previous release", but
# not necessarily, so is not hard coded in assumptions.
-baselinePerfLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.5.1-201509040015
-baselinePerfVersion=R-4.5.1-201509040015
+baselinePerfLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.5.2-201602121500
+baselinePerfVersion=R-4.5.2-201602121500
# TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.5.1
+baselinePerfVersionLabel=4.5.2
#
# "alt" won't be used, for a while, if ever, but this is included as preparation.
baselinePerfAltLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops/R-3.8.2-201301310800
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index d48a1b8f..853dc713 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -303,7 +303,7 @@ then
echo " current_prefix ${current_prefix}" >> ${PERF_OUTFILE}
echo >> ${PERF_OUTFILE}
- ${XVFB_RUN} ${XVFB_RUN_ARGS} ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.resultGenerator -baseline R-4.5.1-201509040015 -current ${buildId} -jvm 8.0 -config linux.gtk.x86_64 -config.properties "linux.gtk.x86_64,SUSE Linux Enterprise Server 11 (x86_64)" -output $perfOutput -dataDir ${dataDir} ${current_prefix} -print -vm ${devJRE} -vmargs ${vmargs} >> ${PERF_OUTFILE}
+ ${XVFB_RUN} ${XVFB_RUN_ARGS} ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.resultGenerator -baseline R-4.5.2-201602121500 -current ${buildId} -jvm 8.0 -config linux.gtk.x86_64 -config.properties "linux.gtk.x86_64,SUSE Linux Enterprise Server 11 (x86_64)" -output $perfOutput -dataDir ${dataDir} ${current_prefix} -print -vm ${devJRE} -vmargs ${vmargs} >> ${PERF_OUTFILE}
RC=$?
if [[ $RC != 0 ]]
then

Back to the top