diff options
13 files changed, 30 insertions, 30 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 e7317064c..bea726ced 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 @@ -7,12 +7,12 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\\\ec 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=\${basedir}/eclipse-platform-4.5.2-linux-gtk.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.5.2-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.5.2-win32.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.5.2-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.5.2-macosx-cocoa-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.6-linux-gtk.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.6-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.6-win32.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.6-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.6-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.5/R-4.5.2-201602121500 +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.6/R-4.6-201606061100 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 d28ae5413..32b5f34b8 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.5.2 +previousReleaseVersion=4.6 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 3c67ea397..169a21112 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,8 +7,8 @@ mkdir -p workarea/${buildId}/eclipse-testing -#cp /home/files/buildzips/mars/SR0/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ -cp /home/files/buildzips/mars/SR0/R-4.5.2-201602121500/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +#cp /home/files/buildzips/neon/R/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/neon/R/R-4.6-201606061100/eclipse-platform-4.6-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh index a2b17b160..45a650897 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh @@ -51,7 +51,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.5.2-linux-gtk-x86_64.tar.gz + # should only be one tar file there, with a name similar to eclipse-platform-4.6-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/build-functions.shsource b/production/build-functions.shsource index 8dab6b7a1..b48216282 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -1160,7 +1160,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.5.2 + API_PREV_REF_LABEL=4.6 fn-write-property API_PREV_REF_LABEL # API_FREEZE_REF_LABEL=4.7M6 API_FREEZE_REF_LABEL=" " @@ -1174,9 +1174,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.5.2-201602121500/eclipse-SDK-4.5.2-win32.zip \ - -DpreviousBaselineName=Eclipse-SDK-4.5.2 \ - -DpreviousBaselineFilename=eclipse-SDK-4.5.2-win32.zip \ + -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-win32.zip \ + -DpreviousBaselineName=Eclipse-SDK-4.6 \ + -DpreviousBaselineFilename=eclipse-SDK-4.6-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 a1e7f9afc..8fce26bd5 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -90,7 +90,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.5.2 +BASEBUILDER_TAG=4.6 B_GIT_EMAIL=genie.releng@eclipse.org B_GIT_NAME="Releng HIPP" diff --git a/production/createReports.sh b/production/createReports.sh index 04310ef39..02b75606e 100755 --- a/production/createReports.sh +++ b/production/createReports.sh @@ -18,7 +18,7 @@ source localBuildProperties.shsource 2>/dev/null JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest export JAVA_HOME=${JAVA_8_HOME} buildIdToTest=${BUILD_ID:-"I20160314-2000"} -buildIdToCompare="4.5/R-4.5.2-201602121500" +buildIdToCompare="4.6/R-4.6-201606061100" build_type=${buildIdToTest:0:1} build_dir_root="${BUILD_HOME}/4${build_type}/siteDir/eclipse/downloads/drops4" build_update_root="${BUILD_HOME}/4${build_type}/siteDir/updates" diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh index 1372785a2..450517fe7 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.5.2-201602121500 -baseEclipse=eclipse-platform-4.5.2-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/R-4.6-201606061100 +baseEclipse=eclipse-platform-4.6-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 62fc8bbb3..d5ce674a8 100755 --- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh +++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh @@ -66,8 +66,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.5" - maintenanceStream="4.5" + printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.6" + maintenanceStream="4.6" fi diff --git a/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh b/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesPatchBuild.sh index cb86a459e..6ee94ce1d 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.5 (Mars Release)" -CON_REPO_NAME="Eclipse Project Java 9 Patch Repository for Eclipse 4.5 (Mars Release)" +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)" 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 f79f98643..3022eeaa4 100755 --- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh @@ -43,7 +43,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.5.2-linux-gtk-x86_64.tar.gz + # should only be one tar file there, with a name similar to eclipse-platform-4.6-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 0b4ef271b..bef08adad 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.7.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.5.2-201602121500 +previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.6-201606061100 # 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.5.2 +previousReleaseVersion=4.6 # 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.5 +previousReleaseVersionRepo=4.6 # 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 @@ -35,10 +35,10 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed # or baselinePerfAlt=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.5.2-201602121500 -baselinePerfVersion=R-4.5.2-201602121500 +baselinePerfLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.6-201606061100 +baselinePerfVersion=R-4.6-201606061100 # TODO: could/should eventually "compute" label, from full version? -baselinePerfVersionLabel=4.5.2 +baselinePerfVersionLabel=4.6 # # "alt" won't be used, for a while, if ever, but this is included as preparation. baselinePerfAltLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops/R-3.8.2-201301310800 diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index 88981b669..b5e2ec9ae 100755 --- a/production/testScripts/updateTestResultsPages.sh +++ b/production/testScripts/updateTestResultsPages.sh @@ -320,7 +320,7 @@ then echo " current_prefix ${current_prefix}" #>> ${PERF_OUTFILE} echo #>> ${PERF_OUTFILE} - ${XVFB_RUN} ${XVFB_RUN_ARGS} ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.resultGenerator -baseline R-4.5.2-201602121500 -current ${buildId} -jvm 8.0 -config linux.gtk.x86_64 -config.properties "linux.gtk.x86_64,SUSE Linux Enterprise Server 11 (x86_64)" -output $perfOutput -dataDir ${dataDir} ${current_prefix} -print -vm ${devJRE} -vmargs ${vmargs} #>> ${PERF_OUTFILE} + ${XVFB_RUN} ${XVFB_RUN_ARGS} ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data $devworkspace -application org.eclipse.test.performance.ui.resultGenerator -baseline R-4.6-201606061100 -current ${buildId} -jvm 8.0 -config linux.gtk.x86_64 -config.properties "linux.gtk.x86_64,SUSE Linux Enterprise Server 11 (x86_64)" -output $perfOutput -dataDir ${dataDir} ${current_prefix} -print -vm ${devJRE} -vmargs ${vmargs} #>> ${PERF_OUTFILE} RC=$? if [[ $RC != 0 ]] then |