From ea7a85962c6372f77d605de699582e3aca2b59bc Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti
Date: Mon, 18 Mar 2019 11:54:14 +0530
Subject: Bug 545101 - Move to release version of 4.11 in build scripts

Change-Id: Idb58f325e8d1ee09fe31a2a05beb1d35dbc715ed
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 production/build-functions.shsource                            |  8 ++++----
 production/createReports.sh                                    |  8 ++++----
 .../miscToolsAndNotes/checkComposites/checkComposites.sh       |  6 +++---
 .../miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml  |  6 +++---
 production/testScripts/configuration/streamSpecific.properties | 10 +++++-----
 production/testScripts/updateTestResultsPages.sh               |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'production')

diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 2cd4029e7..f7ceb49f7 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #*******************************************************************************
-# Copyright (c) 2017 IBM Corporation and others.
+# Copyright (c) 2019 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -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/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 \
+    -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.11-201903070500/eclipse-SDK-4.11-win32-x86_64.zip \
+    -DpreviousBaselineName=Eclipse-SDK-4.11 \
+    -DpreviousBaselineFilename=eclipse-SDK-4.11-win32-x86_64.zip \
     -Djava.io.tmpdir=$TMP_DIR \
     ${FREEZE_PARAMS} \
     apiToolsReports
diff --git a/production/createReports.sh b/production/createReports.sh
index 44f8caf7a..5841f3cb9 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
+# Copyright (c) 2019 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -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.11milestones/S-4.11RC2-201903070500"
+buildIdToCompare="4.11/R-4.11-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.11milestones/S-4.11RC2-201903070500"
-  echo -e "\tlatest_R_build: S-4.11RC2-201903070500"
+  buildIdToCompare="4.11/R-4.11-201903070500"
+  echo -e "\tlatest_R_build: R-4.11-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 bc59b6007..e157ef288 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
+# Copyright (c) 2019 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -22,8 +22,8 @@
 # and then executed in "bash script" build step.
 
 baseEclipseAccessDir=/home/data/httpd/download.eclipse.org
-baseEclipseDirSegment=eclipse/downloads/drops4/S-4.11RC2-201903070500
-baseEclipse=eclipse-platform-4.11RC2-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/R-4.11-201903070500
+baseEclipse=eclipse-platform-4.11-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/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
index 5c088ea38..f5bd6f7aa 100644
--- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
+++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2018 IBM Corporation and others.
+  Copyright (c) 2019 IBM Corporation and others.
 
   This program and the accompanying materials
   are made available under the terms of the Eclipse Public License 2.0
@@ -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.11RC2-201903070500" />
+      value="R-4.11-201903070500" />
     <property
       name="eclispeBaseLabel"
-      value="4.11RC2" />
+      value="4.11" />
 
     <property
       name="platformURL"
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index af400d854..9d8364f4a 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/S-4.11RC2-201903070500
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.11-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.11RC2
+previousReleaseVersion=4.11
 # 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.11milestones
+previousReleaseVersionRepo=4.11
 
 # 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,8 +34,8 @@ 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/S-4.11RC2-201903070500
-baselinePerfVersion=S-4.11RC2-201903070500
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.11-201903070500
+baselinePerfVersion=R-4.11-201903070500
 # TODO: could/should eventually "compute" label, from full version?
 baselinePerfVersionLabel=4.11
 baselinePerfBuildId=I20190307-0500
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 72fd32a0c..be01a65b2 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="S-4.11RC2-201903070500"
+  baselineCode="R-4.11-201903070500"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id
-- 
cgit v1.2.3