Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-09-14 12:27:27 +0000
committerSravan Kumar Lakkimsetti2018-09-19 11:50:51 +0000
commitbe7028af797d780b5425abbf153a47614aa73de3 (patch)
treee67177a1e455114473b22e910e053f93d83d0cb3
parent99a84c3dbe25a45bb24e31d2238224599c5215e2 (diff)
downloadeclipse.platform.releng.aggregator-be7028af797d780b5425abbf153a47614aa73de3.tar.gz
eclipse.platform.releng.aggregator-be7028af797d780b5425abbf153a47614aa73de3.tar.xz
eclipse.platform.releng.aggregator-be7028af797d780b5425abbf153a47614aa73de3.zip
Bug 538625 - Move previous version to 4.9 across build scripts
Change-Id: Ie1675cb6d95215094e0f83733ebf388ffea3cbc7 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
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml10
-rwxr-xr-xproduction/build-functions.shsource8
-rw-r--r--production/build_eclipse_org.shsource2
-rwxr-xr-xproduction/createReports.sh16
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh7
-rw-r--r--production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml8
-rwxr-xr-xproduction/miscToolsAndNotes/updaterepo/updateGenericComposites.sh2
-rwxr-xr-xproduction/sdk/cleaners/cleanupNightlyRepo.sh4
-rwxr-xr-xproduction/testScripts/configuration/sdk.tests/testScripts/runtests.sh2
-rw-r--r--production/testScripts/configuration/streamSpecific.properties14
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
15 files changed, 45 insertions, 46 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index f72f8853..f847b1c9 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -394,7 +394,7 @@
<configuration>
<skip>${compare-version-with-baselines.skip}</skip>
<baselines>
- <baseline>http://download.eclipse.org/eclipse/updates/4.8/</baseline> <!-- Next release (useful after 4.8 is released to compare upcoming 4.8 maitenance with last 4.8 release) -->
+ <baseline>http://download.eclipse.org/eclipse/updates/4.9/</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 791c8300..9152f586 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.8-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.8-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.8-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.9-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.9-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.9-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.8/R-4.8-201806110500
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.9/R-4.9-201809060745
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 f0a8298d..725559c0 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.8
+previousReleaseVersion=4.9
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 cec4bb73..6f216d1d 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.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
-cp /home/files/buildzips/oxygen/R/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+#cp /home/files/buildzips/oxygen/R/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/R-4.9-201809060745/eclipse-platform-4.9-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/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
index 8f96c0f9..f78be963 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
@@ -90,16 +90,16 @@
(and make "version" variable)
-->
<!-- example of typical value, when "directory" and "label" are different
- <property name="eclipseBaseDir" value="S-4.8M3-201710291100"/>
- <property name="eclispeBaseLabel" value="4.8M3"/>
+ <property name="eclipseBaseDir" value="S-4.10M3-201710291100"/>
+ <property name="eclispeBaseLabel" value="4.10M3"/>
-->
<!-- for I or M build (which is the unusual case) the build directory and label are the same -->
<property
name="eclipseBaseDir"
- value="S-4.9RC1-201808301030" />
+ value="R-4.9-201809060745" />
<property
name="eclispeBaseLabel"
- value="4.9RC1" />
+ value="4.9" />
<property
name="platformURL"
@@ -141,7 +141,7 @@
<echo message="DEBUG: Before setting default, eclisperun-repo was found to be ${eclipserun-repo-is-set}" />
<!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when
using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version,
- such as updates/4.8/ once it is ready.
+ such as updates/4.9/ once it is ready.
-->
<property
name="eclipserun-repo"
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 4d1fc99f..79eb73c0 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1151,7 +1151,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.8
+ API_PREV_REF_LABEL=4.9
fn-write-property API_PREV_REF_LABEL
#API_FREEZE_REF_LABEL=4.10M3
API_FREEZE_REF_LABEL=" "
@@ -1165,9 +1165,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.8-201806110500/eclipse-SDK-4.8-win32-x86_64.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.8 \
- -DpreviousBaselineFilename=eclipse-SDK-4.8-win32-x86_64.zip \
+ -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-win32-x86_64.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.9 \
+ -DpreviousBaselineFilename=eclipse-SDK-4.9-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 59df3f97..a0af9fc8 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.8
+BASEBUILDER_TAG=4.9
B_GIT_EMAIL=genie.releng@eclipse.org
B_GIT_NAME="Releng HIPP"
diff --git a/production/createReports.sh b/production/createReports.sh
index c192a002..5483f4bf 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.8/R-4.8-201806110500"
+buildIdToCompare="4.9/R-4.9-201809060745"
build_type=${buildIdToTest:0:1}
echo -e "\tbuild_type: ${build_type}"
@@ -66,22 +66,22 @@ function latestSimpleRepo
if [[ ${build_type} == "I" ]]
then
- update_dir_segment="4.9-I-builds"
- buildIdToCompare="4.8/R-4.8-201806110500"
- echo -e "\tlatest_R_build: R-4.8-201806110500"
+ update_dir_segment="4.10-I-builds"
+ buildIdToCompare="4.9/R-4.9-201809060745"
+ echo -e "\tlatest_R_build: R-4.9-201809060745"
elif [[ ${build_type} == "Y" ]]
then
update_dir_segment="4.9-Y-builds"
# Note: we use same value for Y-builds as for I-builds, since conceptually
- # they are the same, except that Y-builds use some code from BETA_JAVA9 branch.
- latest_I_build=$(latestSimpleRepo "${repo_root}/4.8-I-builds" "I20*")
+ # they are the same, except that Y-builds use some code from BETA_JAVA11 branch.
+ latest_I_build=$(latestSimpleRepo "${repo_root}/4.9-I-builds" "I20*")
RC=$?
if [[ $RC != 0 ]]
then
exit $RC
fi
echo -e "\tlatest_I_build: $latest_I_build"
- buildIdToCompare="4.8-I-builds/${latest_I_build}"
+ buildIdToCompare="4.9-I-builds/${latest_I_build}"
else
echo -e "\nERROR: Unhandled build type: ${build_type} so update_dir_segment undefined: $update_dir_segment"
echo -e "\n\tand repo reports not produced."
@@ -107,7 +107,7 @@ then
mkdir -p ${output_dir}
# This analyzersBuildId can (currently) be found by "drilling down" at
- # http://download.eclipse.org/cbi/updates/analyzers/4.8/
+ # http://download.eclipse.org/cbi/updates/analyzers/4.9/
# analyzersBuildId=I20161201-1633
# We use analyzer from hipp this way we have one less version to track
tar_name=org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 93f3db62..c247f6b2 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.8-201806110500
-baseEclipse=eclipse-platform-4.8-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/R-4.9-201809060745
+baseEclipse=eclipse-platform-4.9-linux-gtk-x86_64.tar.gz
repoFileAccess=file:///home/data/httpd/download.eclipse.org/
repoHttpAccess=http://download.eclipse.org
repoAccess=${repoFileAccess}
@@ -31,9 +31,8 @@ repoAccess=${repoFileAccess}
repoList="\
/eclipse/updates/4.8/ \
/eclipse/updates/4.9/ \
-/eclipse/updates/4.9-I-builds/ \
+/eclipse/updates/4.10/ \
/eclipse/updates/4.9-Y-builds/ \
-/eclipse/updates/4.9milestones/ \
/eclipse/updates/4.10-I-builds/ \
/eclipse/updates/4.10milestones/ \
diff --git a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
index 04b90a4c..191a90d1 100644
--- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
+++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
@@ -97,10 +97,10 @@
<!-- for I or M build (which is the unusual case) the build directory and label are the same -->
<property
name="eclipseBaseDir"
- value="S-4.9RC1-201808301030" />
+ value="R-4.9-201809060745" />
<property
name="eclispeBaseLabel"
- value="4.9RC1" />
+ value="4.9" />
<property
name="platformURL"
@@ -142,11 +142,11 @@
<echo message="DEBUG: Before setting default, eclisperun-repo was found to be ${eclipserun-repo-is-set}" />
<!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when
using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version,
- such as updates/4.8/ once it is ready.
+ such as updates/4.9/ once it is ready.
-->
<property
name="eclipserun-repo"
- value="http://download.eclipse.org/eclipse/updates/4.8-I-builds/" />
+ value="http://download.eclipse.org/eclipse/updates/4.10-I-builds/" />
<echo message="eclipserun-repo: ${eclipserun-repo}" />
<property
diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
index 43b9772d..c438ce47 100755
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
@@ -69,7 +69,7 @@ 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.8"
+ printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.9"
maintenanceStream="4.9"
fi
diff --git a/production/sdk/cleaners/cleanupNightlyRepo.sh b/production/sdk/cleaners/cleanupNightlyRepo.sh
index 93993bcb..71531eb1 100755
--- a/production/sdk/cleaners/cleanupNightlyRepo.sh
+++ b/production/sdk/cleaners/cleanupNightlyRepo.sh
@@ -210,8 +210,8 @@ function cleanRepo ()
remoteBase="/home/data/httpd/download.eclipse.org"
-eclipseIRepo="${remoteBase}/eclipse/updates/4.9-I-builds"
-eclipseSRepo="${remoteBase}/eclipse/updates/4.9milestones"
+eclipseIRepo="${remoteBase}/eclipse/updates/4.10-I-builds"
+eclipseSRepo="${remoteBase}/eclipse/updates/4.10milestones"
eclipseYRepo="${remoteBase}/eclipse/updates/4.9-Y-builds"
eclipsePRepo="${remoteBase}/eclipse/updates/4.9-P-builds"
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
index 61106e69..8d92deb7 100755
--- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
+++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
@@ -50,7 +50,7 @@ then
exit 1
else
echo "stableEclipseInstallation directory found, as expected, at ${stableEclipseInstallLocation}"
- # should only be one tar file there, with a name similar to eclipse-platform-4.8-linux-gtk-x86_64.tar.gz
+ # should only be one tar file there, with a name similar to eclipse-platform-4.9-linux-gtk-x86_64.tar.gz
# so for simplicity, we'll assume all is well and untar what ever we find.
tar -xf ${stableEclipseInstallLocation}/*tar.gz -C ${stableEclipseInstallLocation}
fi
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 4ef4be45..693ec628 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.10.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.8-201806110500
+previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.9-201809060745
# 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.8
+previousReleaseVersion=4.9
# 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.8
+previousReleaseVersionRepo=4.9
# 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://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.8-201806110500
-baselinePerfVersion=R-4.8-201806110500
+baselinePerfLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.9-201809060745
+baselinePerfVersion=R-4.9-201809060745
# TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.8
-baselinePerfBuildId=I20180611-0500
+baselinePerfVersionLabel=4.9
+baselinePerfBuildId=I20180906-0745
eclipse.perf.dbloc.value=//172.25.25.57:1527
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index d182ea5b..57020665 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.8-201806110500"
+ baselineCode="R-4.9-201809060745"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id

Back to the top