Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoopur Gupta2019-12-09 07:17:20 +0000
committerNoopur Gupta2019-12-09 10:55:02 +0000
commita6ccc518d07a5ebc99b19b1536987ae55b479294 (patch)
tree5085f2bf5f1eba6e2f8e26a3348884960307cf22
parent93c68b344a269be0376b9e4cb78944ebc75051d5 (diff)
downloadeclipse.platform.releng.aggregator-a6ccc518d07a5ebc99b19b1536987ae55b479294.tar.gz
eclipse.platform.releng.aggregator-a6ccc518d07a5ebc99b19b1536987ae55b479294.tar.xz
eclipse.platform.releng.aggregator-a6ccc518d07a5ebc99b19b1536987ae55b479294.zip
Bug 553746: Move previous version to 4.14RC2 across build scripts
-rw-r--r--eclipse-platform-parent/pom.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties8
-rwxr-xr-xeclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh4
-rwxr-xr-xproduction/build-functions.shsource6
-rwxr-xr-xproduction/createReports.sh6
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh4
-rw-r--r--production/testScripts/configuration/streamSpecific.properties14
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
8 files changed, 23 insertions, 23 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index c182056fd..986f89c38 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -157,7 +157,7 @@
<qualifier.format>'v'yyyyMMdd-HHmm</qualifier.format>
<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
- <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.13/</previous-release.baseline>
+ <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.14milestones/</previous-release.baseline>
<!--
Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
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 c42a0974c..b4839d99f 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
@@ -5,10 +5,10 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir
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-x86_64=\${basedir}/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.13-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.13-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.14RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.14RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.14RC2-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.13/R-4.13-201909161045/
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.14milestones/S-4.14RC2-201912041800/
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 9dbc58201..8483b48cf 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,9 +7,9 @@
mkdir -p workarea/${buildId}/eclipse-testing
-cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.14RC2-201912041800/eclipse-platform-4.14RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
-cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.14RC2-201912041800/eclipse-SDK-4.14RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index c358cbe9d..2f8e7f098 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1203,9 +1203,9 @@ fn-summarize-apitooling ()
-DbuildId="$BUILD_ID" \
-DbuildLabel="$BUILD_ID" \
-DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \
- -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.13-201909161045/eclipse-SDK-4.13-win32-x86_64.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.13 \
- -DpreviousBaselineFilename=eclipse-SDK-4.13-win32-x86_64.zip \
+ -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.14RC2-201912041800/eclipse-SDK-4.14RC2-win32-x86_64.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.14RC2 \
+ -DpreviousBaselineFilename=eclipse-SDK-4.14RC2-win32-x86_64.zip \
-Djava.io.tmpdir=$TMP_DIR \
${FREEZE_PARAMS} \
apiToolsReports
diff --git a/production/createReports.sh b/production/createReports.sh
index 606952812..26acd34ae 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -37,7 +37,7 @@ echo -e "\tbuildIdToTest: ${BUILD_ID}"
# TODO: we could have a "previous_release" sort of variable that
# would be defined in parent pom or build_eclipse_org.shsource so that
# we do not need to change this source.
-buildIdToCompare="4.13/R-4.13-201909161045"
+buildIdToCompare="4.14milestones/S-4.14RC2-201912041800"
build_type=${buildIdToTest:0:1}
echo -e "\tbuild_type: ${build_type}"
@@ -68,8 +68,8 @@ function latestSimpleRepo
if [[ ${build_type} == "I" ]]
then
update_dir_segment="4.15-I-builds"
- buildIdToCompare="4.13/R-4.13-201909161045"
- echo -e "\tlatest_R_build: R-4.13-201909161045"
+ buildIdToCompare="4.14milestones/S-4.14RC2-201912041800"
+ echo -e "\tlatest_R_build: S-4.14RC2-201912041800"
elif [[ ${build_type} == "Y" ]]
then
update_dir_segment="4.15-Y-builds"
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 7ae182d10..9157e263c 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -22,8 +22,8 @@
# and then executed in "bash script" build step.
baseEclipseAccessDir=/home/data/httpd/download.eclipse.org
-baseEclipseDirSegment=eclipse/downloads/drops4/R-4.13-201909161045
-baseEclipse=eclipse-platform-4.13-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/S-4.14RC2-201912041800
+baseEclipse=eclipse-platform-4.14RC2-linux-gtk-x86_64.tar.gz
repoFileAccess=file:///home/data/httpd/download.eclipse.org/
repoHttpAccess=http://download.eclipse.org
repoAccess=${repoFileAccess}
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 21a648868..a26ff8f03 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.15.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://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.13-201909161045
+previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.14RC2-201912041800
# 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.13
+previousReleaseVersion=4.14RC2
# 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,
# they might want the simple repo, such as at 4.4/R-4.4.1-201409250400
-previousReleaseVersionRepo=4.13
+previousReleaseVersionRepo=4.14milestones
# Note: API tests needs the _base_ of previous release, and also the previous service release
# Bug 378587 - update releng tests (data) to go work against previous release
@@ -34,12 +34,12 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed
# baselinePerf=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://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.13-201909161045
+baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.14RC2-201912041800
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.13-201909161045
+baselinePerfVersion=S-4.14RC2-201912041800
# TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.13
-baselinePerfBuildId=I20190916-1045
+baselinePerfVersionLabel=4.14
+baselinePerfBuildId=I20191204-1800
# Derby database cannot used to store performance results anymore. (see Bug 548523)
# Instead samples are serialized into a file and included in build artifacts.
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 9ddb8a6b5..06e6d4b7e 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -314,7 +314,7 @@ then
# TODO: avoid this hard coding of baseline value
# NOTE: value must start with a letter match baselinePerfVersion in testScripts/configuration/streamSpecific.properties
- baselineCode="R-4.13-201909161045"
+ baselineCode="S-4.14RC2-201912041800"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id

Back to the top