diff options
8 files changed, 23 insertions, 23 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index a2135ab9d..5074c106e 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -376,7 +376,7 @@ <configuration> <skip>${compare-version-with-baselines.skip}</skip> <baselines> - <baseline>https://download.eclipse.org/eclipse/updates/4.11/</baseline> <!-- Previous release) --> + <baseline>https://download.eclipse.org/eclipse/updates/4.12-I-builds/</baseline> <!-- Previous release) --> </baselines> <comparator>zip</comparator> </configuration> 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 3e1517d1e..a660ba976 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.11-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.11-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.11-macosx-cocoa-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.12RC2-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.12RC2-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.12RC2-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.11/R-4.11-201903070500/ +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.12milestones/S-4.12RC2-201906051800/ 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 016d79bf9..1397c758b 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/oxygen/R/R-4.11-201903070500/eclipse-SDK-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ -cp /home/files/buildzips/oxygen/R/R-4.11-201903070500/eclipse-platform-4.11-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +#cp /home/files/buildzips/oxygen/R/S-4.12RC2-201906051800/eclipse-SDK-4.12RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/S-4.12RC2-201906051800/eclipse-platform-4.12RC2-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/production/build-functions.shsource b/production/build-functions.shsource index 91b5502d6..2143c0854 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/R-4.11-201903070500/eclipse-SDK-4.11-win32-x86_64.zip \ - -DpreviousBaselineName=Eclipse-SDK-4.11 \ - -DpreviousBaselineFilename=eclipse-SDK-4.11-win32-x86_64.zip \ + -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 \ -Djava.io.tmpdir=$TMP_DIR \ ${FREEZE_PARAMS} \ apiToolsReports diff --git a/production/createReports.sh b/production/createReports.sh index 02eab3d6b..ee2cf6c40 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.11/R-4.11-201903070500" +buildIdToCompare="4.12milestones/S-4.12RC2-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.11/R-4.11-201903070500" - echo -e "\tlatest_R_build: R-4.11-201903070500" + buildIdToCompare="4.12milestones/S-4.12RC2-201906051800" + echo -e "\tlatest_R_build: S-4.12RC2-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 3d458330e..3cc65e273 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/R-4.11-201903070500 -baseEclipse=eclipse-platform-4.11-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/S-4.12RC2-201906051800 +baseEclipse=eclipse-platform-4.12RC2-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/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index f76a976df..cc25a8990 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/R-4.11-201903070500 +previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.12RC2-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.11 +previousReleaseVersion=4.12RC2 # 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.11 +previousReleaseVersionRepo=4.12milestones # 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://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.11-201903070500 -baselinePerfVersion=R-4.11-201903070500 +baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.12RC2-201906051800 +baselinePerfVersion=S-4.12RC2-201906051800 # TODO: could/should eventually "compute" label, from full version? -baselinePerfVersionLabel=4.11 -baselinePerfBuildId=I20190307-0500 +baselinePerfVersionLabel=4.12 +baselinePerfBuildId=I20190605-1800 eclipse.perf.dbloc.value=//172.25.25.57:1527 diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index be01a65b2..182683553 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.11-201903070500" + baselineCode="S-4.12RC2-201906051800" # to get time stamp, first remove initial IMN: baselineForBuildSuffix=${buildId/[IMN]/} #Then remove final '-' in build id |