Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Chandra2019-09-09 06:32:06 -0400
committerVikas Chandra2019-09-09 06:44:33 -0400
commit6e6561eac70c64f1a68688b7913a607acf7f0dfd (patch)
tree28e662d6e42f0c4c98eb6c9b7c8a878f604baffb
parent23854c05c083df3abc8b5898a73b3ab745cca05f (diff)
downloadeclipse.platform.releng.aggregator-6e6561eac70c64f1a68688b7913a607acf7f0dfd.tar.gz
eclipse.platform.releng.aggregator-6e6561eac70c64f1a68688b7913a607acf7f0dfd.tar.xz
eclipse.platform.releng.aggregator-6e6561eac70c64f1a68688b7913a607acf7f0dfd.zip
Bug 550772 - Move previous version to 4.13RC2 across build scripts
Change-Id: Ic02672d903b69b9bef3280b96451588b043f6b24 Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
-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 f309e4ec..7bece9a9 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.12/</previous-release.baseline>
+ <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.13-I-builds/</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 2144751a..add344ba 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.12-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.12-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.12-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.13RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.13RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.13RC2-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.12/R-4.12-201906051800/
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.13milestones/S-4.13RC2-201909071130/
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 f702d963..92d8e09c 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.12-201906051800/eclipse-platform-4.12-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.13RC2-201909071130/eclipse-platform-4.13RC2-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/
+cp /home/files/buildzips/oxygen/R/S-4.13RC2-201909071130/eclipse-SDK-4.13RC2-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 4c59a643..c00a417a 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1169,9 +1169,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.12-201906051800/eclipse-SDK-4.12-win32-x86_64.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.12 \
- -DpreviousBaselineFilename=eclipse-SDK-4.12-win32-x86_64.zip \
+ -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.13RC2-201909071130/eclipse-SDK-4.13RC2-win32-x86_64.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.13RC2 \
+ -DpreviousBaselineFilename=eclipse-SDK-4.13RC2-win32-x86_64.zip \
-Djava.io.tmpdir=$TMP_DIR \
${FREEZE_PARAMS} \
apiToolsReports
diff --git a/production/createReports.sh b/production/createReports.sh
index af94268f..4a329ee8 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -36,7 +36,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.12/R-4.12-201906051800"
+buildIdToCompare="4.13milestones/S-4.13RC2-201909071130"
build_type=${buildIdToTest:0:1}
echo -e "\tbuild_type: ${build_type}"
@@ -67,8 +67,8 @@ function latestSimpleRepo
if [[ ${build_type} == "I" ]]
then
update_dir_segment="4.13-I-builds"
- buildIdToCompare="4.12/R-4.12-201906051800"
- echo -e "\tlatest_R_build: R-4.12-201906051800"
+ buildIdToCompare="4.13milestones/S-4.13RC2-201909071130"
+ echo -e "\tlatest_R_build: S-4.13RC2-201909071130"
elif [[ ${build_type} == "Y" ]]
then
update_dir_segment="4.13-Y-builds"
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 70b13caf..2ff5ce44 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.12-201906051800
-baseEclipse=eclipse-platform-4.12-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/S-4.13RC2-201909071130
+baseEclipse=eclipse-platform-4.13RC2-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 d8488e7d..99a0c756 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.13.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.12-201906051800
+previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.13RC2-201909071130
# 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.12
+previousReleaseVersion=4.13RC2
# 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.12
+previousReleaseVersionRepo=4.13milestones
# 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,11 +34,11 @@ 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.12-201906051800
-baselinePerfVersion=R-4.12-201906051800
+baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.13RC2-201909071130
+baselinePerfVersion=4.13RC2-201909071130
# TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.12
-baselinePerfBuildId=I20190605-1800
+baselinePerfVersionLabel=4.13
+baselinePerfBuildId=I20190907-1130
# 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 6786a8c1..f4f937a0 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -314,7 +314,7 @@ then
RAW_DATE_START=$( date -u +%s )
# TODO: avoid this hard coding of baseline value
- baselineCode="R-4.12-201906051800"
+ baselineCode="S-4.13RC2-201909071130"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id

Back to the top