Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSarika Sinha2019-06-19 01:27:08 -0400
committerSarika Sinha2019-06-19 05:40:37 -0400
commit195bd4e8a25987e385ea1de7a9cb89096dcfcc56 (patch)
treef4ac10ff5f1ea35dec06fa818098fa199ee4a42d /production
parent5243e3a1704373f7ad6afa2f3664c15b7d5f0a12 (diff)
downloadeclipse.platform.releng.aggregator-195bd4e8a25987e385ea1de7a9cb89096dcfcc56.tar.gz
eclipse.platform.releng.aggregator-195bd4e8a25987e385ea1de7a9cb89096dcfcc56.tar.xz
eclipse.platform.releng.aggregator-195bd4e8a25987e385ea1de7a9cb89096dcfcc56.zip
Bug 547925 - Move to release version of 4.12 in build scripts
Diffstat (limited to 'production')
-rwxr-xr-xproduction/build-functions.shsource6
-rwxr-xr-xproduction/createReports.sh6
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh4
-rwxr-xr-xproduction/miscToolsAndNotes/updaterepo/updateGenericComposites.sh6
-rw-r--r--production/testScripts/configuration/streamSpecific.properties10
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
6 files changed, 17 insertions, 17 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 1bcc92eb..b74bdf0f 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -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=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.12RC2-201906051800/eclipse-SDK-4.12RC2-win32-x86_64.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.12RC2 \
- -DpreviousBaselineFilename=eclipse-SDK-4.12RC2-win32-x86_64.zip \
+ -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.12-201906051800/eclipse-SDK-4.12-win32-x86_64.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.12 \
+ -DpreviousBaselineFilename=eclipse-SDK-4.12-win32-x86_64.zip \
-Djava.io.tmpdir=$TMP_DIR \
${FREEZE_PARAMS} \
apiToolsReports
diff --git a/production/createReports.sh b/production/createReports.sh
index ee2cf6c4..af94268f 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.12milestones/S-4.12RC2-201906051800"
+buildIdToCompare="4.12/R-4.12-201906051800"
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.13-I-builds"
- buildIdToCompare="4.12milestones/S-4.12RC2-201906051800"
- echo -e "\tlatest_R_build: S-4.12RC2-201906051800"
+ buildIdToCompare="4.12/R-4.12-201906051800"
+ echo -e "\tlatest_R_build: R-4.12-201906051800"
elif [[ ${build_type} == "Y" ]]
then
update_dir_segment="4.13-Y-builds"
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 3cc65e27..70b13caf 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/S-4.12RC2-201906051800
-baseEclipse=eclipse-platform-4.12RC2-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/R-4.12-201906051800
+baseEclipse=eclipse-platform-4.12-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/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
index 8d652370..c8800875 100755
--- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
+++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#*******************************************************************************
-# Copyright (c) 2015 IBM Corporation and others.
+# Copyright (c) 2015, 2019 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
@@ -69,8 +69,8 @@ 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.11"
- maintenanceStream="4.11"
+ printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.12"
+ maintenanceStream="4.12"
fi
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index cc25a899..53f99819 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.13.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.12RC2-201906051800
+previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.12-201906051800
# 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.12RC2
+previousReleaseVersion=4.12
# 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.12milestones
+previousReleaseVersionRepo=4.12
# 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.12RC2-201906051800
-baselinePerfVersion=S-4.12RC2-201906051800
+baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.12-201906051800
+baselinePerfVersion=R-4.12-201906051800
# TODO: could/should eventually "compute" label, from full version?
baselinePerfVersionLabel=4.12
baselinePerfBuildId=I20190605-1800
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 18268355..18a8192d 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.12RC2-201906051800"
+ baselineCode="R-4.12-201906051800"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id

Back to the top