diff options
author | Sravan Kumar Lakkimsetti | 2017-06-29 09:55:53 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2017-06-29 09:55:53 +0000 |
commit | 5ab6c5419f9291892a7a6ccbac519ecd43f09720 (patch) | |
tree | f2a0743ab23c990af872a4947f5562d997473135 /production | |
parent | dcca872a7da3dcee3e1ea051d67063e9a9246b04 (diff) | |
download | eclipse.platform.releng.aggregator-5ab6c5419f9291892a7a6ccbac519ecd43f09720.tar.gz eclipse.platform.releng.aggregator-5ab6c5419f9291892a7a6ccbac519ecd43f09720.tar.xz eclipse.platform.releng.aggregator-5ab6c5419f9291892a7a6ccbac519ecd43f09720.zip |
Bug 518936 - Update previous release to 4.7
Change-Id: I1bd5ebe44f53ff926b7d0499d92fd4e24895256b
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'production')
13 files changed, 38 insertions, 42 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource index b5d5b850a..52881d101 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -1175,7 +1175,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.6.3 + API_PREV_REF_LABEL=4.7 fn-write-property API_PREV_REF_LABEL # API_FREEZE_REF_LABEL=4.7M6 API_FREEZE_REF_LABEL=" " @@ -1189,9 +1189,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.6.3-201703010400/eclipse-SDK-4.6.3-win32.zip \ - -DpreviousBaselineName=Eclipse-SDK-4.6.3 \ - -DpreviousBaselineFilename=eclipse-SDK-4.6.3-win32.zip \ + -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-win32.zip \ + -DpreviousBaselineName=Eclipse-SDK-4.7 \ + -DpreviousBaselineFilename=eclipse-SDK-4.7-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 58943e108..566454137 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -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.6.3 +BASEBUILDER_TAG=4.7 B_GIT_EMAIL=genie.releng@eclipse.org B_GIT_NAME="Releng HIPP" diff --git a/production/createReports.sh b/production/createReports.sh index a474e8a06..781813c87 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.6/R-4.6.3-201703010400" +buildIdToCompare="4.7/R-4.7-201706120950" build_type=${buildIdToTest:0:1} echo -e "\tbuild_type: ${build_type}" @@ -66,7 +66,7 @@ then update_dir_segment="4.8-N-builds" # Note: I am not sure all N-build comparisons are meaninful. # we may want a way to "skip" those comparisons. - latest_M_build=$(latestSimpleRepo "${repo_root}/4.6-M-builds" "M20*") + latest_M_build=$(latestSimpleRepo "${repo_root}/4.7-M-builds" "M20*") RC=$? if [[ $RC != 0 ]] then @@ -77,17 +77,17 @@ then elif [[ ${build_type} == "M" ]] then update_dir_segment="4.7-M-builds" - buildIdToCompare="4.7/R-4.6.3-201703010400" - echo -e "\tlatest_R_build: R-4.6.3-201703010400" + buildIdToCompare="4.7/R-4.7-201706120950" + echo -e "\tlatest_R_build: R-4.7-201706120950" elif [[ ${build_type} == "I" ]] then update_dir_segment="4.8-I-builds" # We use a function that gets the "latest" simple repo under - # 4.6-M-builds and use that automatically so each I-build automatically is + # 4.7-M-builds and use that automatically so each I-build automatically is # compared to the latest M-build, instead of having to manually update this value - # TODO: But, the "4.6" part has to be updated every year. There is probably + # TODO: But, the "4.7" part has to be updated every year. There is probably # some other variable to "infer" that from so this script never has to change. - latest_M_build=$(latestSimpleRepo "${repo_root}/4.6-M-builds" "M20*") + latest_M_build=$(latestSimpleRepo "${repo_root}/4.7-M-builds" "M20*") RC=$? if [[ $RC != 0 ]] then @@ -100,14 +100,14 @@ then update_dir_segment="4.8-Y-builds" # Note: we use same value for Y-builds as for I-builds, since conceptually # they are the same, except that Y-builds use some code from BETA_JAVA9 branch. - latest_M_build=$(latestSimpleRepo "${repo_root}/4.6-M-builds" "M20*") + latest_M_build=$(latestSimpleRepo "${repo_root}/4.7-M-builds" "M20*") RC=$? if [[ $RC != 0 ]] then exit $RC fi echo -e "\tlatest_M_build: $latest_M_build" - buildIdToCompare="4.6-M-builds/${latest_M_build}" + buildIdToCompare="4.7-M-builds/${latest_M_build}" else echo -e "\nERROR: Unhandled build type: ${build_type} so update_dir_segment undefined: $update_dir_segment" echo -e "\n\tand repo reports not produced." @@ -133,7 +133,7 @@ then mkdir -p ${output_dir} # This analyzersBuildId can (currently) be found by "drilling down" at - # http://download.eclipse.org/cbi/updates/analyzers/4.6/ + # http://download.eclipse.org/cbi/updates/analyzers/4.7/ # analyzersBuildId=I20161201-1633 # We use analyzer from hipp this way we have one less version to track tar_name=org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh index 8aeac5de1..91f2120d4 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.6.3-201703010400 -baseEclipse=eclipse-platform-4.6.3-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7-201706120950 +baseEclipse=eclipse-platform-4.7-linux-gtk-x86_64.tar.gz repoFileAccess=file:///home/data/httpd/download.eclipse.org/ repoHttpAccess=http://download.eclipse.org repoAccess=${repoFileAccess} @@ -28,11 +28,7 @@ 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.8-P-builds/ \ /eclipse/updates/4.8-Y-builds/ \ /eclipse/updates/4.8-I-builds/ \ diff --git a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml index 64a8871e3..e59d6c4c0 100644 --- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml +++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml @@ -94,10 +94,10 @@ <!-- for I or M build (which is the unusual case) the build directory and label are the same --> <property name="eclipseBaseDir" - value="R-4.6-201606061100" /> + value="R-4.7-201706120950" /> <property name="eclispeBaseLabel" - value="4.6" /> + value="4.7" /> <property name="platformURL" @@ -139,7 +139,7 @@ <echo message="DEBUG: Before setting default, eclisperun-repo was found to be ${eclipserun-repo-is-set}" /> <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version, - such as updates/4.6/ once it is ready. + such as updates/4.7/ once it is ready. --> <property name="eclipserun-repo" diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml index 6d354dbf4..2a45ae979 100644 --- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml +++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml @@ -24,10 +24,10 @@ <fail unless="currentStream" - message="currentStream (such as '4.7') must be defined for this script" /> + message="currentStream (such as '4.8') must be defined for this script" /> <fail unless="maintenanceStream" - message="maintenanceStream (such as '4.6') must be defined for this script" /> + message="maintenanceStream (such as '4.7') 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/production/sdk/bootstrap/mb4M.sh b/production/sdk/bootstrap/mb4M.sh index 59b459582..1dcc6fc75 100755 --- a/production/sdk/bootstrap/mb4M.sh +++ b/production/sdk/bootstrap/mb4M.sh @@ -78,9 +78,9 @@ echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) " 1>$LOG_OUT_NAME 2>$LOG_E echo "umask explicitly set to $NEWUMASK, old value was $oldumask" 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME -export BRANCH=R4_6_maintenance +export BRANCH=R4_7_maintenance export BUILD_TYPE=M -export STREAM=4.6.3 +export STREAM=4.7.1 eclipseStreamMajor=${STREAM:0:1} diff --git a/production/sdk/bootstrap/mb4M_hudson.sh b/production/sdk/bootstrap/mb4M_hudson.sh index f3c7eb1f9..8f7fa690b 100755 --- a/production/sdk/bootstrap/mb4M_hudson.sh +++ b/production/sdk/bootstrap/mb4M_hudson.sh @@ -78,9 +78,9 @@ echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) " echo "umask explicitly set to $NEWUMASK, old value was $oldumask" -export BRANCH=R4_6_maintenance +export BRANCH=R4_7_maintenance export BUILD_TYPE=M -export STREAM=4.6.3 +export STREAM=4.7.1 eclipseStreamMajor=${STREAM:0:1} diff --git a/production/sdk/promoteStableRelease/promote/promoteSites.sh b/production/sdk/promoteStableRelease/promote/promoteSites.sh index d1baafbf1..087b0f2ba 100755 --- a/production/sdk/promoteStableRelease/promote/promoteSites.sh +++ b/production/sdk/promoteStableRelease/promote/promoteSites.sh @@ -20,7 +20,7 @@ # On Hudson, the job must be defined as a parameterized job, with the parameters # in this file defined with the same names as in this file. # From a command line, the script can be ran, or tested, with something similar to -# DROP_ID=I20160602-0112 CHECKPOINT=RC4 SIGNOFF_BUG="" TRAIN_NAME=Neon STREAM=4.6.0 DL_TYPE=S DRYRUN=false ./promoteSites.sh +# DROP_ID=I20160602-0112 CHECKPOINT=RC4 SIGNOFF_BUG="" TRAIN_NAME=Oxygen STREAM=4.7.0 DL_TYPE=S DRYRUN=false ./promoteSites.sh # These first three variables DROP_ID, CHECKPOINT, and SIGNOFF_BUG diff --git a/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh b/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh index 6ee94ce1d..d322a9091 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh @@ -65,8 +65,8 @@ fi # TODO: control with variable! #ART_REPO_NAME="Eclipse Project Repository for ${TRAIN_NAME}" #CON_REPO_NAME="Eclipse Project Repository for ${TRAIN_NAME}" -ART_REPO_NAME="Eclipse Project Java 9 Patch Repository for Eclipse 4.6 (Neon Release)" -CON_REPO_NAME="Eclipse Project Java 9 Patch Repository for Eclipse 4.6 (Neon Release)" +ART_REPO_NAME="Eclipse Project Java 9 Patch Repository for Eclipse 4.7 (Oxygen Release)" +CON_REPO_NAME="Eclipse Project Java 9 Patch Repository for Eclipse 4.7 (Oxygen Release)" MIRRORS_URL_ARG=-Dp2MirrorsURL=${MIRRORURL_ARG} ART_REPO_ARG=-DartifactRepoDirectory=${REPO} diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh index 77224f869..11cf3543f 100755 --- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh @@ -50,7 +50,7 @@ then exit 1 else echo "stableEclipseInstallation directory found, as expected, at ${stableEclipseInstallLocation}" - # should only be one tar file there, with a name similar to eclipse-platform-4.6.3-linux-gtk-x86_64.tar.gz + # should only be one tar file there, with a name similar to eclipse-platform-4.7-linux-gtk-x86_64.tar.gz # so for simplicity, we'll assume all is well and untar what ever we find. tar -xf ${stableEclipseInstallLocation}/*tar.gz -C ${stableEclipseInstallLocation} fi diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index 8b43bc3d7..b4aed838d 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.8.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://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.6.3-201703010400 +previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7-201706120950 # 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.6.3 +previousReleaseVersion=4.7 # 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.6 +previousReleaseVersionRepo=4.7 # 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,11 +34,11 @@ 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://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.6-201606061100 -baselinePerfVersion=R-4.6-201606061100 +baselinePerfLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7-201706120950 +baselinePerfVersion=R-4.7-201706120950 # TODO: could/should eventually "compute" label, from full version? -baselinePerfVersionLabel=4.6 -baselinePerfBuildId=I20160606-1100 +baselinePerfVersionLabel=4.7 +baselinePerfBuildId=I20170612-0950 eclipse.perf.dbloc.value=//172.25.25.57:1527 diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index 719316946..00190d737 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="R-4.6-201606061100" + baselineCode="R-4.7-201706120950" # to get time stamp, first remove initial IMN: baselineForBuildSuffix=${buildId/[IMN]/} #Then remove final '-' in build id |