Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2020-06-05 11:13:21 +0000
committerSravan Kumar Lakkimsetti2020-06-05 11:17:04 +0000
commit8969f04a729cc253bda741b51669670035fa5de4 (patch)
tree03af18daa474603243d21ade8075028421caa52b
parent38ff08e547848f4dce1369aec81755efe2356c88 (diff)
downloadeclipse.platform.releng.aggregator-8969f04a729cc253bda741b51669670035fa5de4.tar.gz
eclipse.platform.releng.aggregator-8969f04a729cc253bda741b51669670035fa5de4.tar.xz
eclipse.platform.releng.aggregator-8969f04a729cc253bda741b51669670035fa5de4.zip
Bug 563843 - Move previous version to 4.16RC2 across build scripts
Change-Id: I0c7a430854d626e74b4c900697b766b4bb2b81a1 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--cje-production/Y-build/buildproperties.txt11
-rw-r--r--cje-production/buildproperties.txt10
-rwxr-xr-xcje-production/mbscripts/mb030_downloadBuildToCompare.sh13
-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--production/testScripts/configuration/streamSpecific.properties14
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
9 files changed, 32 insertions, 34 deletions
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index 98f4dd05d..2ca63fcbc 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -38,12 +38,13 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
LOCAL_REPO="localMavenRepo"
# Base builder parameters
-BASEBUILDER_TAG="4.15"
-API_PREV_REF_LABEL="4.15"
-#API_FREEZE_REF_LABEL="4.15RC1"
+BASEBUILDER_TAG="4.16"
+API_PREV_REF_LABEL="4.16"
+#API_FREEZE_REF_LABEL="4.17RC1"
API_FREEZE_REF_LABEL=""
-PREVIOUS_RELEASE_VER="4.15"
-PREVIOUS_RELEASE_ID="R-4.15-202003050155"
+PREVIOUS_RELEASE_VER="4.16RC2"
+PREVIOUS_RELEASE_REPO_ID="4.16milestones"
+PREVIOUS_RELEASE_ID="S-4.16RC2-202006040540"
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/"
WEBTOOLS_VER="1.2.0.v201405010053"
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index d1cd424e0..736330f5e 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -38,8 +38,8 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
LOCAL_REPO="localMavenRepo"
# Base builder parameters
-BASEBUILDER_TAG="4.15"
-API_PREV_REF_LABEL="4.15"
+BASEBUILDER_TAG="4.16"
+API_PREV_REF_LABEL="4.16"
#API_FREEZE_REF_LABEL="4.17RC1"
API_FREEZE_REF_LABEL=""
# Change to appropriate versions and uncomment when entering API freeze
@@ -47,8 +47,10 @@ API_FREEZE_REF_LABEL=""
# Otherwise set to a blank space
FREEZE_PARAMS=" "
-PREVIOUS_RELEASE_VER="4.15"
-PREVIOUS_RELEASE_ID="R-4.15-202003050155"
+PREVIOUS_RELEASE_VER="4.16RC2"
+PREVIOUS_RELEASE_REPO_ID="4.16milestones"
+PREVIOUS_RELEASE_ID="S-4.16RC2-202006040540"
+
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/"
WEBTOOLS_VER="1.2.0.v201405010053"
diff --git a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
index f0cc5b265..0b711f6b2 100755
--- a/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
+++ b/cje-production/mbscripts/mb030_downloadBuildToCompare.sh
@@ -24,13 +24,8 @@ source $CJE_ROOT/scripts/common-functions.shsource
source $1
pushd $CJE_ROOT/$TMP_DIR
-if [[ -z "${WORKSPACE}" ]]
-then
- wget --recursive --no-parent --no-verbose https://$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID &
-else
- mkdir -p $CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER
- epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse
- p2RepoPath=${epDownloadDir}/updates
- scp -r genie.releng@projects-storage.eclipse.org:$p2RepoPath/$PREVIOUS_RELEASE_VER/$PREVIOUS_RELEASE_ID $CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/.
-fi
+mkdir -p $CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER
+epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse
+p2RepoPath=${epDownloadDir}/updates
+scp -r genie.releng@projects-storage.eclipse.org:$p2RepoPath/$PREVIOUS_RELEASE_REPO_ID/$PREVIOUS_RELEASE_ID $CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/.
popd
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 8121ad4ea..4f20901ad 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -148,7 +148,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.15/R-4.15-202003050155/</previous-release.baseline>
+ <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.16milestones/S-4.16RC2-202006040540/</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 69289849a..f5ff196ab 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.15-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.15-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.15-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.16RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.16RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.16RC2-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.15/R-4.15-202003050155/
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.16milestones/S-4.16RC2-202006040540/
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 a07a088cb..d2a28c0e3 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.15
+previousReleaseVersion=4.16
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 1a64995c6..c6833eb04 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.15-202003050155/eclipse-platform-4.15-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.16RC2-202006040540/eclipse-platform-4.16RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
-cp /home/files/buildzips/oxygen/R/R-4.15-202003050155/eclipse-SDK-4.15-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.16RC2-202006040540/eclipse-SDK-4.16RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index ddf07baec..5ea17db1c 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.17.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=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.15-202003050155
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.16RC2-202006040540
# 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.15
+previousReleaseVersion=4.16RC2
# 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.15
+previousReleaseVersionRepo=4.16milestones
# 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=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.15-202003050155
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.16RC2-202006040540
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.15-202003050155
+baselinePerfVersion=S-4.16RC2-202006040540
# TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.15
-baselinePerfBuildId=I20200305-0155
+baselinePerfVersionLabel=4.16RC2
+baselinePerfBuildId=I20200604-0540
# 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 e6554e1f8..9e0a380a4 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -310,7 +310,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.15-202003050155"
+ baselineCode="S-4.16RC2-202006040540"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id

Back to the top