Bug 573974 - Use 4.20 GA version across build scriptsY20210615-0910Y20210615-0900

Change-Id: I125b6f54a2e0125dc7e54803a78822e9f59743e0
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/181953
Tested-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

6 files changed, 18 insertions, 18 deletions

diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 27b6efe75..ed3b449fb 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -47,12 +47,12 @@ API_FREEZE_REF_LABEL=""
 # Otherwise set to a blank space
 FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.20RC2"
-PREVIOUS_RELEASE_REPO_ID="4.20-I-builds"
+PREVIOUS_RELEASE_VER="4.20"
+PREVIOUS_RELEASE_REPO_ID="4.20"
 #build id for getting repo
-BASEBUILD_ID="I20210603-0040"
+BASEBUILD_ID="R-4.20-202106111600"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="S-4.20RC2-202106030040"
+PREVIOUS_RELEASE_ID="R-4.20-202106111600"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.20.0/R-3.20.0-20201201143606/repositoryunittests/"
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index f3e115ba5..becf08ca1 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -140,7 +140,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.20-I-builds/I20210603-0040/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600/</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 92aa69fc3..b7969ba57 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.dmg
 
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.20RC2-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.20RC2-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.20RC2-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.20-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.20-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.20-macosx-cocoa-x86_64.dmg
 
 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.20-I-builds/I20210603-0040/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600/
 
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 f03028039..79f3f0df1 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/S-4.20RC2-202106030040//eclipse-platform-4.20RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/R-4.20-202106111600//eclipse-platform-4.20-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/S-4.20RC2-202106030040//eclipse-SDK-4.20RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/R-4.20-202106111600//eclipse-SDK-4.20-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 3ffe9bc49..336a6fd40 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.21.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/S-4.20RC2-202106030040/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.20-202106111600/
 # 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.20RC2
+previousReleaseVersion=4.20
 # 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.20-I-builds
+previousReleaseVersionRepo=4.20
 
 # 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/S-4.20RC2-202106030040
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.20-202106111600
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=S-4.20RC2-202106030040
+baselinePerfVersion=R-4.20-202106111600
 # TODO: could/should eventually "compute" label, from full version?
 baselinePerfVersionLabel=4.20
-baselinePerfBuildId=I20210603-0040
+baselinePerfBuildId=I20210611-1600
 
 # We currently set here, but would be better to compute this value 
 # by peeking in the "to be tested" tar file. 
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index ded45eeed..d51cf6555 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -295,7 +295,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="S-4.20RC2-202106030040"
+  baselineCode="R-4.20-202106111600"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id