diff options
10 files changed, 27 insertions, 27 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index b4493ec13..5f2e184da 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -48,7 +48,7 @@ such as Version: Mars (4.5), for main features. See bug 328139. --> - <releaseName>Oxygen.3</releaseName> + <releaseName>Oxygen.3a</releaseName> <!-- The releaseNumbers below, for SDK and Platform, might be thought of as the "marketing number" or "branding number", @@ -63,8 +63,8 @@ but we'd still want the "marketing number" to be increased to reflect "a new yearly release". --> - <releaseNumberSDK>4.7.3</releaseNumberSDK> - <releaseNumberPlatform>4.7.3</releaseNumberPlatform> + <releaseNumberSDK>4.7.3a</releaseNumberSDK> + <releaseNumberPlatform>4.7.3a</releaseNumberPlatform> <!-- Using snapshot, or locally built (forked) snapshot version for bug 484000. 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 6b5d277e3..c4a99f54b 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.7.2-linux-gtk.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7.2-win32.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7.2-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7.2-macosx-cocoa-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.7.3-linux-gtk.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7.3-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7.3-win32.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7.3-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7.3-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.7/R-4.7.2-201711300510 +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.7/R-4.7.3-201803010715 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 2e8ccaa03..dc5893e55 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.7.2 +previousReleaseVersion=4.7.3 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 3369d593a..357ad9c7b 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.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ -cp /home/files/buildzips/oxygen/R/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +#cp /home/files/buildzips/oxygen/R/R-4.7.3-201803010715/eclipse-SDK-4.7.3-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/R-4.7.3-201803010715/eclipse-platform-4.7.3-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 6c235f555..5e9a1625a 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 @@ -58,7 +58,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.7.2-linux-gtk-x86_64.tar.gz + # should only be one tar file there, with a name similar to eclipse-platform-4.7.3-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 8afe5e729..a040cdffb 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.2 + API_PREV_REF_LABEL=4.7.3 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.2-201711300510/eclipse-SDK-4.7.2-win32.zip \ - -DpreviousBaselineName=Eclipse-SDK-4.7.2 \ - -DpreviousBaselineFilename=eclipse-SDK-4.7.2-win32.zip \ + -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.3-201803010715/eclipse-SDK-4.7.3-win32.zip \ + -DpreviousBaselineName=Eclipse-SDK-4.7.3 \ + -DpreviousBaselineFilename=eclipse-SDK-4.7.3-win32.zip \ -Djava.io.tmpdir=$TMP_DIR \ ${FREEZE_PARAMS} \ apiToolsReports diff --git a/production/createReports.sh b/production/createReports.sh index 393463189..c42952098 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.2-201711300510" +buildIdToCompare="4.7/R-4.7.3-201803010715" 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.2-201711300510" - echo -e "\tlatest_R_build: R-4.7.2-201711300510" + buildIdToCompare="4.7/R-4.7.3-201803010715" + echo -e "\tlatest_R_build: R-4.7.3-201803010715" 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 5521b1660..77d52c9b6 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.2-201711300510 -baseEclipse=eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7.3-201803010715 +baseEclipse=eclipse-platform-4.7.3-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/sdk.tests/testScripts/testTestXMLScript.sh b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh index 2847d9395..4513e8487 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.2 -Dosgi.os=linux +ant -f test.xml test-all -propertyfile vm.properties -DbuildId=I20160430-0237 -DeclipseStream=4.7.3 -Dosgi.os=linux diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index a9e090c2b..7ff36946d 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.3 builds and tests" +streamSpecificPropertiesTitle="Properties for 4.7.3a 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.2-201711300510 +previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.3-201803010715 # 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.2 +previousReleaseVersion=4.7.3 # 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.2 +previousReleaseVersionRepo=4.7.3 # 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 |