Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2017-10-13 08:29:47 -0400
committerSravan Kumar Lakkimsetti2017-10-13 08:29:47 -0400
commita6a2f680935641bdba12330d38545bb8c74406a7 (patch)
treedbf06fcb56eeed6405fec071bd7f9a1a29ded116 /production
parenta7b25d4f3cbdb84ac57e12be32d7c8020b1de56f (diff)
downloadeclipse.platform.releng.aggregator-a6a2f680935641bdba12330d38545bb8c74406a7.tar.gz
eclipse.platform.releng.aggregator-a6a2f680935641bdba12330d38545bb8c74406a7.tar.xz
eclipse.platform.releng.aggregator-a6a2f680935641bdba12330d38545bb8c74406a7.zip
Bug 525994 - Update branding and build scripts for 4.7.2 release
Change-Id: I423d4a7785d390b454081fae501a8d5de55ef97b Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'production')
-rwxr-xr-xproduction/build-functions.shsource8
-rw-r--r--production/build_eclipse_org.shsource4
-rwxr-xr-xproduction/createReports.sh6
-rwxr-xr-xproduction/miscToolsAndNotes/checkComposites/checkComposites.sh13
-rwxr-xr-xproduction/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh2
-rw-r--r--production/testScripts/configuration/streamSpecific.properties8
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh2
7 files changed, 21 insertions, 22 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 08ce15b1..b57b3dd7 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -1153,7 +1153,7 @@ fn-summarize-apitooling ()
# place, and not have to make further, hard-coded changes to php files.
# Similar for freeze label.
# NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release".
- API_PREV_REF_LABEL=4.7.1
+ API_PREV_REF_LABEL=4.7.1a
fn-write-property API_PREV_REF_LABEL
API_FREEZE_REF_LABEL=4.7M6
# API_FREEZE_REF_LABEL=" "
@@ -1167,9 +1167,9 @@ fn-summarize-apitooling ()
-DbuildId="$BUILD_ID" \
-DbuildLabel="$BUILD_ID" \
-DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \
- -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.1-201709061700/eclipse-SDK-4.7.1-win32.zip \
- -DpreviousBaselineName=Eclipse-SDK-4.7.1 \
- -DpreviousBaselineFilename=eclipse-SDK-4.7.1-win32.zip \
+ -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-win32.zip \
+ -DpreviousBaselineName=Eclipse-SDK-4.7.1a \
+ -DpreviousBaselineFilename=eclipse-SDK-4.7.1a-win32.zip \
-Djava.io.tmpdir=$TMP_DIR \
${FREEZE_PARAMS} \
apiToolsReports
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 5aac0190..2691975b 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -18,7 +18,7 @@ source localBuildProperties.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
export BRANCH=${BRANCH:-master}
-export STREAM=${STREAM:-4.7.1}
+export STREAM=${STREAM:-4.7.2}
export BUILD_TYPE=${BUILD_TYPE:-N}
# If not set be caller, make sure its an empty string
@@ -93,7 +93,7 @@ export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH
# Only used to start antrunner for tests.
# TODO: avoid this hard coding
-BASEBUILDER_TAG=4.7.1
+BASEBUILDER_TAG=4.7.2
B_GIT_EMAIL=genie.releng@eclipse.org
B_GIT_NAME="Releng HIPP"
diff --git a/production/createReports.sh b/production/createReports.sh
index f969b343..0b86ff90 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -33,7 +33,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.7/R-4.7.1-201709061700"
+buildIdToCompare="4.7/R-4.7.1a-201710090410"
build_type=${buildIdToTest:0:1}
echo -e "\tbuild_type: ${build_type}"
@@ -77,8 +77,8 @@ then
elif [[ ${build_type} == "M" ]]
then
update_dir_segment="4.7-M-builds"
- buildIdToCompare="4.7/R-4.7.1-201709061700"
- echo -e "\tlatest_R_build: R-4.7.1-201709061700"
+ buildIdToCompare="4.7/R-4.7.1a-201710090410"
+ echo -e "\tlatest_R_build: R-4.7.1a-201710090410"
elif [[ ${build_type} == "I" ]]
then
update_dir_segment="4.7-I-builds"
diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
index 06a7c671..1e50fc71 100755
--- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh
+++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh
@@ -19,8 +19,8 @@
# and then executed in "bash script" build step.
baseEclipseAccessDir=/home/data/httpd/download.eclipse.org
-baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7.1-201709061700
-baseEclipse=eclipse-platform-4.7.1-linux-gtk-x86_64.tar.gz
+baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7.1a-201710090410
+baseEclipse=eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz
repoFileAccess=file:///home/data/httpd/download.eclipse.org/
repoHttpAccess=http://download.eclipse.org
repoAccess=${repoFileAccess}
@@ -28,11 +28,10 @@ repoAccess=${repoFileAccess}
repoList="\
/eclipse/updates/4.5/ \
/eclipse/updates/4.6/ \
-/eclipse/updates/4.6-P-builds/ \
-/eclipse/updates/4.7-P-builds/ \
-/eclipse/updates/4.7-N-builds/ \
-/eclipse/updates/4.7-I-builds/ \
-/eclipse/updates/4.7milestones/ \
+/eclipse/updates/4.7/ \
+/eclipse/updates/4.7-M-builds/ \
+/eclipse/updates/4.8-I-builds/ \
+/eclipse/updates/4.8milestones/ \
"
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh
index 6acd7a0b..b0d48133 100755
--- a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh
+++ b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh
@@ -57,5 +57,5 @@ export TESTING_TEST_XML=true
# to simply test the test script itself. The test-all target runs all of those tests.
#ant -f test.xml test-all
-ant -f test.xml test-all -propertyfile vm.properties -DbuildId=I20160430-0237 -DeclipseStream=4.7.1 -Dosgi.os=linux
+ant -f test.xml test-all -propertyfile vm.properties -DbuildId=I20160430-0237 -DeclipseStream=4.7.1a -Dosgi.os=linux
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index c8ae8142..12edad67 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -5,22 +5,22 @@
# purely title or identifier for display, to help confirm right file
# is being retrieved and used.
-streamSpecificPropertiesTitle="Properties for 4.7.1a builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.7.2 builds and tests"
# These "previousRelease" variables are primarily used to have a
# 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://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7-201706120950
+previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.1a-201710090410
# 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.7
+previousReleaseVersion=4.7.1a
# 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.7
+previousReleaseVersionRepo=4.7.1a
# 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
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index 5017cfd7..9be6dd7e 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -86,7 +86,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose http://${GIT_HOST}/c/platfor
ANTFILE=getEBuilder.xml
buildId=I20150320-0800
-eclipseStream=4.7.1
+eclipseStream=4.7.2
EBUILDER_HASH=master
#EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a

Back to the top