Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2019-03-08 07:30:27 -0500
committerSravan Kumar Lakkimsetti2019-03-08 07:30:27 -0500
commit33c98ae20fb663f32a5900da6942d89bc210c274 (patch)
tree596ab15855bb69bc56843cff776a5b446e6f0168
parent55383c58f426ce7851e2d28b00785061b5f2498c (diff)
downloadeclipse.platform.releng.aggregator-33c98ae20fb663f32a5900da6942d89bc210c274.tar.gz
eclipse.platform.releng.aggregator-33c98ae20fb663f32a5900da6942d89bc210c274.tar.xz
eclipse.platform.releng.aggregator-33c98ae20fb663f32a5900da6942d89bc210c274.zip
Bug 545098 - Move previous version to 4.10RC2 across build scripts
Change-Id: I23277389b03342ee571e4dd5a8de15743d68d554 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@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
-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.sh4
-rwxr-xr-xproduction/build-functions.shsource8
-rw-r--r--production/build_eclipse_org.shsource2
-rwxr-xr-xproduction/createReports.sh6
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh4
-rwxr-xr-xproduction/miscToolsAndNotes/updaterepo/updateGenericComposites.sh4
-rw-r--r--production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml2
-rw-r--r--production/testScripts/configuration/streamSpecific.properties14
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
12 files changed, 29 insertions, 29 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index d09ebf46..101a8c36 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -376,7 +376,7 @@
<configuration>
<skip>${compare-version-with-baselines.skip}</skip>
<baselines>
- <baseline>http://download.eclipse.org/eclipse/updates/4.10/</baseline> <!-- Previous release) -->
+ <baseline>http://download.eclipse.org/eclipse/updates/4.11-I-builds/</baseline> <!-- Previous release) -->
</baselines>
<comparator>zip</comparator>
</configuration>
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 4e5e1b9c..5d141063 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.10-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.10-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.10-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.11RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.11RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.11RC2-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.10/R-4.10-201812060815
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.11milestones/S-4.11RC2-201903070500/
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 f71750da..6e37eb5f 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.10
+previousReleaseVersion=4.11
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 ac0dd251..74fe4949 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,8 +7,8 @@
mkdir -p workarea/${buildId}/eclipse-testing
-#cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
-cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-platform-4.10-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+#cp /home/files/buildzips/oxygen/R/S-4.11RC2-201903070500/eclipse-SDK-4.11RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.11RC2-201903070500/eclipse-platform-4.11RC2-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/production/build-functions.shsource b/production/build-functions.shsource
index 2f960f21..9383a6e7 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1155,7 +1155,7 @@ fn-summarize-apitooling ()
# place, and not have to make further, hard-coded changes to php files.
# 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.10
+ API_PREV_REF_LABEL=4.11
fn-write-property API_PREV_REF_LABEL
#API_FREEZE_REF_LABEL=4.12RC1
API_FREEZE_REF_LABEL=" "
@@ -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=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.10-201812060815/eclipse-SDK-4.10-win32-x86_64.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.10 \
- -DpreviousBaselineFilename=eclipse-SDK-4.10-win32-x86_64.zip \
+ -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.11RC2-201903070500/eclipse-SDK-4.11RC2-win32-x86_64.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.11RC2 \
+ -DpreviousBaselineFilename=eclipse-SDK-4.11RC2-win32-x86_64.zip \
-Djava.io.tmpdir=$TMP_DIR \
${FREEZE_PARAMS} \
apiToolsReports
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 29ffe40c..e33b0797 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -96,7 +96,7 @@ export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH
# Only used to start antrunner for tests.
# TODO: avoid this hard coding
-BASEBUILDER_TAG=4.10
+BASEBUILDER_TAG=4.11
B_GIT_EMAIL=genie.releng@eclipse.org
B_GIT_NAME="Releng HIPP"
diff --git a/production/createReports.sh b/production/createReports.sh
index 6bbc83d6..44f8caf7 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.10/R-4.10-201812060815"
+buildIdToCompare="4.11milestones/S-4.11RC2-201903070500"
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.12-I-builds"
- buildIdToCompare="4.10/R-4.10-201812060815"
- echo -e "\tlatest_R_build: R-4.10-201812060815"
+ buildIdToCompare="4.11milestones/S-4.11RC2-201903070500"
+ echo -e "\tlatest_R_build: S-4.11RC2-201903070500"
elif [[ ${build_type} == "Y" ]]
then
update_dir_segment="4.12-Y-builds"
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 75babd2f..bc59b600 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.10-201812060815
-baseEclipse=eclipse-platform-4.10-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/S-4.11RC2-201903070500
+baseEclipse=eclipse-platform-4.11RC2-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/miscToolsAndNotes/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
index c6dd28e3..94d1204f 100755
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
@@ -69,8 +69,8 @@ fi
maintenanceStream=$2
if [[ -z "${maintenanceStream}" ]]
then
- printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.10"
- maintenanceStream="4.10"
+ printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.11"
+ maintenanceStream="4.11"
fi
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
index 274973f7..db4fcfa6 100644
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml
@@ -30,7 +30,7 @@
message="currentStream (such as '4.12') must be defined for this script" />
<fail
unless="maintenanceStream"
- message="maintenanceStream (such as '4.10') must be defined for this script" />
+ message="maintenanceStream (such as '4.11') must be defined for this script" />
<!-- Note: we do not put stream number in 'name', since once a 'name' is defined
in Eclipse's UI, it does not change. -->
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index e15f79fc..af400d85 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.12.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.10-201812060815
+previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.11RC2-201903070500
# 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.10
+previousReleaseVersion=4.11RC2
# 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.10
+previousReleaseVersionRepo=4.11milestones
# 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.10-201812060815
-baselinePerfVersion=R-4.10-201812060815
+baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.11RC2-201903070500
+baselinePerfVersion=S-4.11RC2-201903070500
# TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.10
-baselinePerfBuildId=I20181206-0815
+baselinePerfVersionLabel=4.11
+baselinePerfBuildId=I20190307-0500
eclipse.perf.dbloc.value=//172.25.25.57:1527
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index dbebd2dd..72fd32a0 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.10-201812060815"
+ baselineCode="S-4.11RC2-201903070500"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id

Back to the top