Bug 569321 - Move previous version to 4.18RC2 across build scripts

Change-Id: If5f83a8dabb7d551bf66b74f4ddff564ac1cc003
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

11 files changed, 41 insertions, 41 deletions

diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
index 370ac5b81..cdedfa327 100644
--- a/cje-production/P-build/buildproperties.txt
+++ b/cje-production/P-build/buildproperties.txt
@@ -39,18 +39,18 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.17"
-API_PREV_REF_LABEL="4.17"
-#API_FREEZE_REF_LABEL="4.17RC1"
+BASEBUILDER_TAG="4.18RC2"
+API_PREV_REF_LABEL="4.18RC2"
+#API_FREEZE_REF_LABEL="4.19RC1"
 API_FREEZE_REF_LABEL=""
 # Change to appropriate versions and uncomment when entering API freeze
-#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.16RC1-202005280200/eclipse-SDK-4.16RC1-win32-x86_64.zip -DfreezeName=Eclipse-SDK-4.16RC1 -DfreezeFilename=eclipse-SDK-4.16RC1-win32-x86_64.zip"
+#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.19RC1-202103031800/eclipse-SDK-4.19RC1-win32-x86_64.zip -DfreezeName=Eclipse-SDK-4.19RC1 -DfreezeFilename=eclipse-SDK-4.19RC1-win32-x86_64.zip"
 # Otherwise set to a blank space
 FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.17"
-PREVIOUS_RELEASE_REPO_ID="4.17"
-PREVIOUS_RELEASE_ID="R-4.17-202009021800"
+PREVIOUS_RELEASE_VER="4.18RC2"
+PREVIOUS_RELEASE_REPO_ID="4.18milestones"
+PREVIOUS_RELEASE_ID="S-4.18RC2-202012021800"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.18.0/R-3.18.0-20200605032700/repositoryunittests/"
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index fe1cd9375..1bf5d78a0 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -38,18 +38,18 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.17"
-API_PREV_REF_LABEL="4.17"
-#API_FREEZE_REF_LABEL="4.17RC1"
+BASEBUILDER_TAG="4.18RC2"
+API_PREV_REF_LABEL="4.18RC2"
+#API_FREEZE_REF_LABEL="4.19RC1"
 API_FREEZE_REF_LABEL=""
 # Change to appropriate versions and uncomment when entering API freeze
-#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202008261800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
+#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202103031800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
 # Otherwise set to a blank space
 FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.17"
-PREVIOUS_RELEASE_REPO_ID="4.17"
-PREVIOUS_RELEASE_ID="R-4.17-202009021800"
+PREVIOUS_RELEASE_VER="4.18RC2"
+PREVIOUS_RELEASE_REPO_ID="4.18milestones"
+PREVIOUS_RELEASE_ID="S-4.18RC2-202012021800"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.18.0/R-3.18.0-20200605032700/repositoryunittests/"
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 040b8c121..97069cb01 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -38,18 +38,18 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.17"
-API_PREV_REF_LABEL="4.17"
+BASEBUILDER_TAG="4.18RC2"
+API_PREV_REF_LABEL="4.18RC2"
 API_FREEZE_REF_LABEL="4.19RC1"
 #API_FREEZE_REF_LABEL=""
 # Change to appropriate versions and uncomment when entering API freeze
-FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202011251800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
+FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202103031800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
 # Otherwise set to a blank space
 #FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.17"
-PREVIOUS_RELEASE_REPO_ID="4.17"
-PREVIOUS_RELEASE_ID="R-4.17-202009021800"
+PREVIOUS_RELEASE_VER="4.18RC2"
+PREVIOUS_RELEASE_REPO_ID="4.18milestones"
+PREVIOUS_RELEASE_ID="S-4.18RC2-202012021800"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.18.0/R-3.18.0-20200605032700/repositoryunittests/"
diff --git a/cje-production/scripts/updateGenericComposites.xml b/cje-production/scripts/updateGenericComposites.xml
index 39208c009..9380bd8cf 100644
--- a/cje-production/scripts/updateGenericComposites.xml
+++ b/cje-production/scripts/updateGenericComposites.xml
@@ -27,10 +27,10 @@
 
     <fail
       unless="currentStream"
-      message="currentStream (such as '4.17') must be defined for this script" />
+      message="currentStream (such as '4.19') must be defined for this script" />
     <fail
       unless="previousStream"
-      message="maintenanceStream (such as '4.17') must be defined for this script" />
+      message="maintenanceStream (such as '4.18') 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/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 33efc65e9..59fbdc89b 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.17/R-4.17-202009021800/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.18milestones/S-4.18RC2-202012021800/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
@@ -597,12 +597,12 @@
         <versionRangeForPatch>[3.18.500.v20200826-1800,3.18.549.v20210708-1800)</versionRangeForPatch>
         <versionRangeForPatchPDE>[3.14.500.v20200826-1800,3.14.549.v20210708-1800)</versionRangeForPatchPDE>
         <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.17milestones/</comparator.repo>
+        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.19milestones/</comparator.repo>
       </properties>
       <repositories>
        <repository>
          <id>eclipse-p2-repo-java15patch</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.17milestones/</url>
+         <url>https://download.eclipse.org/eclipse/updates/4.19milestones/</url>
          <layout>p2</layout>
        </repository>
      </repositories>
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 f006b3bb9..ca5ba3144 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.17-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.17-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.17-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.18RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.18RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.18RC2-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.17/R-4.17-202009021800/
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.18milestones/S-4.18RC2-202012021800/
 
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 8edda031e..3acbec580 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.17
+previousReleaseVersion=4.18RC2
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 5b34b86a9..b598deb85 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.17-202009021800//eclipse-platform-4.17-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.18RC2-202012021800//eclipse-platform-4.18RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/R-4.17-202009021800//eclipse-SDK-4.17-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.18RC2-202012021800//eclipse-SDK-4.18RC2-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 c2adf134c..b90340ddc 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.19.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.17-202009021800/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.18RC2-202012021800/
 # 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.17
+previousReleaseVersion=4.18RC2
 # 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.17
+previousReleaseVersionRepo=4.18milestones
 
 # 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.17-202009021800
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.18RC2-202012021800
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.17-202009021800
+baselinePerfVersion=S-4.18RC2-202012021800
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.17
-baselinePerfBuildId=I20200902-1800
+baselinePerfVersionLabel=4.18RC2
+baselinePerfBuildId=I20201202-1800
 
 # 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/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index 1f2003ded..fa11e7315 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -81,7 +81,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose   https://${GIT_HOST}/c/platfo
 
 ANTFILE=getEBuilder.xml
 buildId=I20150320-0800
-eclipseStream=4.17.0
+eclipseStream=4.19.0
 EBUILDER_HASH=master
 #EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a
 
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index a51a6ff8b..ca1ea5d39 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="R-4.17-202009021800"
+  baselineCode="S-4.18RC2-202012021800"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id