Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Chandra2019-12-18 08:51:03 +0000
committerVikas Chandra2019-12-18 08:51:03 +0000
commit09f50290f0e12c35fcbad2529e471434b0b27084 (patch)
tree66a244f63ececd77ab04dca67f501616078f12fb
parentacdff5c14edf30c087c7747b2c2197ca5e4c9232 (diff)
downloadeclipse.platform.releng.aggregator-09f50290f0e12c35fcbad2529e471434b0b27084.tar.gz
eclipse.platform.releng.aggregator-09f50290f0e12c35fcbad2529e471434b0b27084.tar.xz
eclipse.platform.releng.aggregator-09f50290f0e12c35fcbad2529e471434b0b27084.zip
Bug 553751 - Move to release version of 4.14 in build scripts
Change-Id: I93afd2fcfa5b4423b92b2e38f0e310bda67073a1 Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
-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--eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml4
-rwxr-xr-xproduction/build-functions.shsource14
-rwxr-xr-xproduction/createReports.sh6
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh4
-rw-r--r--production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml4
-rw-r--r--production/testScripts/configuration/streamSpecific.properties8
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
10 files changed, 28 insertions, 28 deletions
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 b4839d99..9e53ce0b 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.14RC2-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.14RC2-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.14RC2-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.14-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.14-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.14milestones/S-4.14RC2-201912041800/
+org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.14milestones/R-4.14-201912100610/
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 dd7c87bb..a2a3eee0 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.13
+previousReleaseVersion=4.14
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 8483b48c..c1e02fa4 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.14RC2-201912041800/eclipse-platform-4.14RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-platform-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
-cp /home/files/buildzips/oxygen/R/S-4.14RC2-201912041800/eclipse-SDK-4.14RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/R-4.14-201912100610/eclipse-SDK-4.14-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
index 3b3bfc7d..85ead3fe 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
@@ -96,10 +96,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.14RC1-201911271800" />
+ value="R-4.14-201912100610" />
<property
name="eclispeBaseLabel"
- value="4.14RC1" />
+ value="4.14" />
<property
name="platformURL"
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 6095b185..b4746362 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1181,9 +1181,9 @@ fn-summarize-apitooling ()
# Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports.
FREEZE_PARAMS=" "
# When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions.
- #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.14RC1-201911271800/eclipse-SDK-4.14RC1-win32-x86_64.zip \
- # -DfreezeName=Eclipse-SDK-4.14RC1 \
- # -DfreezeFilename=eclipse-SDK-4.14RC1-win32-x86_64.zip "
+ #FREEZE_PARAMS="-DfreezeBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610/eclipse-SDK-4.14-win32-x86_64.zip \
+ # -DfreezeName=Eclipse-SDK-4.14 \
+ # -DfreezeFilename=eclipse-SDK-4.14-win32-x86_64.zip "
# this API_PREV_REF_LABEL variable should be changed any time the version used
# by previousBaseURL changes. Its purpose is just to localize changes to this one
# place, and not have to make further, hard-coded changes to php files.
@@ -1191,7 +1191,7 @@ fn-summarize-apitooling ()
# NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release".
API_PREV_REF_LABEL=4.14
fn-write-property API_PREV_REF_LABEL
- #API_FREEZE_REF_LABEL=4.14RC2
+ #API_FREEZE_REF_LABEL=4.14
API_FREEZE_REF_LABEL=" "
fn-write-property API_FREEZE_REF_LABEL
java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
@@ -1203,9 +1203,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.14RC2-201912041800/eclipse-SDK-4.14RC2-win32-x86_64.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.14RC2 \
- -DpreviousBaselineFilename=eclipse-SDK-4.14RC2-win32-x86_64.zip \
+ -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610/eclipse-SDK-4.14-win32-x86_64.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.14 \
+ -DpreviousBaselineFilename=eclipse-SDK-4.14-win32-x86_64.zip \
-Djava.io.tmpdir=$TMP_DIR \
${FREEZE_PARAMS} \
apiToolsReports
diff --git a/production/createReports.sh b/production/createReports.sh
index 26acd34a..4c57f6f2 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -37,7 +37,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.14milestones/S-4.14RC2-201912041800"
+buildIdToCompare="4.14milestones/R-4.14-201912100610"
build_type=${buildIdToTest:0:1}
echo -e "\tbuild_type: ${build_type}"
@@ -68,8 +68,8 @@ function latestSimpleRepo
if [[ ${build_type} == "I" ]]
then
update_dir_segment="4.15-I-builds"
- buildIdToCompare="4.14milestones/S-4.14RC2-201912041800"
- echo -e "\tlatest_R_build: S-4.14RC2-201912041800"
+ buildIdToCompare="4.14milestones/R-4.14-201912100610"
+ echo -e "\tlatest_R_build: R-4.14-201912100610"
elif [[ ${build_type} == "Y" ]]
then
update_dir_segment="4.15-Y-builds"
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 9157e263..e491c291 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.14RC2-201912041800
-baseEclipse=eclipse-platform-4.14RC2-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/R-4.14-201912100610
+baseEclipse=eclipse-platform-4.14-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 d6cda063..83059d2e 100644
--- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
+++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml
@@ -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.14RC1-201911271800" />
+ value="R-4.14-201912100610" />
<property
name="eclispeBaseLabel"
- value="4.14RC1" />
+ value="4.14" />
<property
name="platformURL"
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index a26ff8f0..fd58ebe1 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,11 +11,11 @@ streamSpecificPropertiesTitle="Properties for 4.15.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.14RC2-201912041800
+previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610
# 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.14RC2
+previousReleaseVersion=4.14
# 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,
@@ -34,9 +34,9 @@ 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.14RC2-201912041800
+baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.14-201912100610
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=S-4.14RC2-201912041800
+baselinePerfVersion=R-4.14-201912100610
# TODO: could/should eventually "compute" label, from full version?
baselinePerfVersionLabel=4.14
baselinePerfBuildId=I20191204-1800
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 06e6d4b7..af0e9d72 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -314,7 +314,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.14RC2-201912041800"
+ baselineCode="R-4.14-201912100610"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id

Back to the top