Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKit Lo2021-06-08 18:15:07 +0000
committerSravan Kumar Lakkimsetti2021-06-09 03:09:17 +0000
commitec821c1dc1f6ae9401a0effa182832c3344abe67 (patch)
tree5a4541af46f226cbe361a65a28c2b22d20e4510e
parent1b33e76c51ca52a3e478f5bd2d54c849ee2f12f1 (diff)
downloadeclipse.platform.releng.aggregator-ec821c1dc1f6ae9401a0effa182832c3344abe67.tar.gz
eclipse.platform.releng.aggregator-ec821c1dc1f6ae9401a0effa182832c3344abe67.tar.xz
eclipse.platform.releng.aggregator-ec821c1dc1f6ae9401a0effa182832c3344abe67.zip
Bug 574084 - Update Y-builds test runs to use Java 17Y20210608-2330
Change-Id: If478167bbc66a17a990c093672bf981f32f0fbe1 Signed-off-by: Kit Lo <kitlo@us.ibm.com> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/181629 Tested-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com> Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--JenkinsJobs/Builds/Y-build.groovy13
-rw-r--r--cje-production/Y-build/buildproperties.txt31
-rw-r--r--cje-production/Y-build/publish.xml4
-rw-r--r--cje-production/Y-build/publish2.xml2
-rw-r--r--cje-production/Y-build/testConfigs.php1
-rw-r--r--cje-production/streams/repositories_java16patch.txt5
-rw-r--r--cje-production/streams/repositories_java17.txt (renamed from cje-production/streams/repositories_java16.txt)10
-rw-r--r--cje-production/streams/repositories_java17patch.txt5
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java17.php (renamed from eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php)0
9 files changed, 38 insertions, 33 deletions
diff --git a/JenkinsJobs/Builds/Y-build.groovy b/JenkinsJobs/Builds/Y-build.groovy
index b72834694..f5d687e5b 100644
--- a/JenkinsJobs/Builds/Y-build.groovy
+++ b/JenkinsJobs/Builds/Y-build.groovy
@@ -475,10 +475,11 @@ spec:
stage('Trigger tests'){
steps {
container('jnlp') {
- build job: 'ep420Y-unit-cen64-gtk3-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
- build job: 'ep420Y-unit-cen64-gtk3-java16', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
- build job: 'ep420Y-unit-mac64-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
- build job: 'ep420Y-unit-win32-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+ build job: 'ep421Y-unit-cen64-gtk3-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+ build job: 'ep421Y-unit-cen64-gtk3-java16', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+ build job: 'ep421Y-unit-cen64-gtk3-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+ build job: 'ep421Y-unit-mac64-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+ build job: 'ep421Y-unit-win32-java11', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
build job: 'Start-smoke-tests', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
}
}
@@ -488,13 +489,13 @@ spec:
failure {
emailext body: "Please go to <a href='${BUILD_URL}console'>${BUILD_URL}console</a> and check the build failure.<br><br>",
subject: "${env.BUILD_VERSION} Y-Build: ${env.BUILD_IID.trim()} - BUILD FAILED",
- to: "jarthana@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com",
+ to: "jarthana@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com kitlo@us.ibm.com",
from:"genie.releng@eclipse.org"
}
success {
emailext body: "Eclipse downloads:<br> <a href='https://download.eclipse.org/eclipse/downloads/drops4/${env.BUILD_IID.trim()}'>https://download.eclipse.org/eclipse/downloads/drops4/${env.BUILD_IID.trim()}</a><br><br> Build logs and/or test results (eventually):<br> <a href='https://download.eclipse.org/eclipse/downloads/drops4/${env.BUILD_IID.trim()}/testResults.php'>https://download.eclipse.org/eclipse/downloads/drops4/${env.BUILD_IID.trim()}/testResults.php</a><br><br>${env.POM_UPDATES_BODY.trim()}${env.COMPARATOR_ERRORS_BODY.trim()}Software site repository:<br> <a href='https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-Y-builds'>https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-Y-builds</a><br><br>Specific (simple) site repository:<br> <a href='https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-Y-builds/${env.BUILD_IID.trim()}'>https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-Y-builds/${env.BUILD_IID.trim()}</a><br><br>Equinox downloads:<br> <a href='https://download.eclipse.org/equinox/drops/${env.BUILD_IID.trim()}'>https://download.eclipse.org/equinox/drops/${env.BUILD_IID.trim()}</a><br><br>",
subject: "${env.BUILD_VERSION} Y-Build: ${env.BUILD_IID.trim()} ${env.POM_UPDATES_SUBJECT.trim()} ${env.COMPARATOR_ERRORS_SUBJECT.trim()}",
- to: "jarthana@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com",
+ to: "jarthana@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com kitlo@us.ibm.com",
from:"genie.releng@eclipse.org"
}
}
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index 329fd7dea..988af004a 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2020 IBM Corporation and others.
+# Copyright (c) 2021 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
@@ -17,14 +17,14 @@
# CJE build variables
BRANCH="master"
-PATCH_OR_BRANCH_LABEL="java16"
-BUILD_TYPE_NAME="Beta Java 16"
+PATCH_OR_BRANCH_LABEL="java17"
+BUILD_TYPE_NAME="Beta Java 17"
BUILD_TYPE="Y"
TESTED_BUILD_TYPE="Y"
-RELEASE_VER="4.19"
-STREAM="4.19.0"
+RELEASE_VER="4.21"
+STREAM="4.21.0"
STREAMMajor="4"
-STREAMMinor="19"
+STREAMMinor="21"
STREAMService="0"
GIT_ROOT="ssh://genie.releng@git.eclipse.org:29418"
AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
@@ -38,23 +38,26 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
LOCAL_REPO="localMavenRepo"
# Base builder parameters
-BASEBUILDER_TAG="4.18"
-API_PREV_REF_LABEL="4.18"
-#API_FREEZE_REF_LABEL="4.19RC1"
+BASEBUILDER_TAG="4.20"
+API_PREV_REF_LABEL="4.20"
+#API_FREEZE_REF_LABEL="4.21RC1"
API_FREEZE_REF_LABEL=""
# Change to appropriate versions and uncomment when entering API freeze
-#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202103031800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
+#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202105262310/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
# Otherwise set to a blank space
FREEZE_PARAMS=" "
-PREVIOUS_RELEASE_VER="4.18"
-PREVIOUS_RELEASE_REPO_ID="4.18"
-PREVIOUS_RELEASE_ID="R-4.18-202012021800"
+PREVIOUS_RELEASE_VER="4.20RC2"
+PREVIOUS_RELEASE_REPO_ID="4.20-I-builds"
+#build id for getting repo
+BASEBUILD_ID="I20210603-0040"
+#release id for downloading eclipse
+PREVIOUS_RELEASE_ID="S-4.20RC2-202106030040"
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.18.0/R-3.18.0-20200605032700/repositoryunittests/"
BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.19-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.21-I-builds/"
#Maven parameters
MAVEN_OPTS="-Xmx6G"
diff --git a/cje-production/Y-build/publish.xml b/cje-production/Y-build/publish.xml
index a917c4475..308a59d5c 100644
--- a/cje-production/Y-build/publish.xml
+++ b/cje-production/Y-build/publish.xml
@@ -97,7 +97,7 @@
testManifestFileName: name of xml file containing descriptions of zip types and log files
-->
-
+
<!-- This list is for Eclipse. Equinox overrides and provides their own list -->
<property
name="dropTokenList"
@@ -248,7 +248,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
- value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java16_linux.gtk.x86_64_16" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java16_linux.gtk.x86_64_16,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java17_linux.gtk.x86_64_17" />
<echo message=" = = properties in publish.xml == " />
<echo message=" job: ${job}" />
diff --git a/cje-production/Y-build/publish2.xml b/cje-production/Y-build/publish2.xml
index 574a23d83..a7da4d5cb 100644
--- a/cje-production/Y-build/publish2.xml
+++ b/cje-production/Y-build/publish2.xml
@@ -271,7 +271,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
- value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java16_linux.gtk.x86_64_16" />
+ value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java11_macosx.cocoa.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java11_win32.win32.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java11_linux.gtk.x86_64_11,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java16_linux.gtk.x86_64_16,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java17_linux.gtk.x86_64_17" />
<echo message=" = = properties in publish.xml == " />
<echo message=" job: ${job}" />
diff --git a/cje-production/Y-build/testConfigs.php b/cje-production/Y-build/testConfigs.php
index 975a4d713..91e31ff83 100644
--- a/cje-production/Y-build/testConfigs.php
+++ b/cje-production/Y-build/testConfigs.php
@@ -14,3 +14,4 @@ $expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64-
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-java11_win32.win32.x86_64_11";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java11_linux.gtk.x86_64_11";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java16_linux.gtk.x86_64_16";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java17_linux.gtk.x86_64_17";
diff --git a/cje-production/streams/repositories_java16patch.txt b/cje-production/streams/repositories_java16patch.txt
deleted file mode 100644
index ea559c4ba..000000000
--- a/cje-production/streams/repositories_java16patch.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.jdt.core: BETA_JAVA16
-eclipse.jdt.ui: BETA_JAVA16
-eclipse.pde.build: BETA_JAVA16
-eclipse.pde.ui: BETA_JAVA16
-eclipse.jdt.debug: BETA_JAVA16 \ No newline at end of file
diff --git a/cje-production/streams/repositories_java16.txt b/cje-production/streams/repositories_java17.txt
index ca0611cd2..41975b3b1 100644
--- a/cje-production/streams/repositories_java16.txt
+++ b/cje-production/streams/repositories_java17.txt
@@ -3,12 +3,12 @@ rt.equinox.bundles: master
rt.equinox.framework: master
rt.equinox.p2: master
eclipse.jdt.core.binaries: master
-eclipse.jdt.core: BETA_JAVA16
-eclipse.jdt.debug: BETA_JAVA16
+eclipse.jdt.core: master
+eclipse.jdt.debug: master
eclipse.jdt: master
-eclipse.jdt.ui: BETA_JAVA16
-eclipse.pde.build: BETA_JAVA16
-eclipse.pde.ui: BETA_JAVA16
+eclipse.jdt.ui: master
+eclipse.pde.build: master
+eclipse.pde.ui: master
eclipse.platform.debug: master
eclipse.platform.resources: master
eclipse.platform: master
diff --git a/cje-production/streams/repositories_java17patch.txt b/cje-production/streams/repositories_java17patch.txt
new file mode 100644
index 000000000..0aaa5cd40
--- /dev/null
+++ b/cje-production/streams/repositories_java17patch.txt
@@ -0,0 +1,5 @@
+eclipse.jdt.core: master
+eclipse.jdt.ui: master
+eclipse.pde.build: master
+eclipse.pde.ui: master
+eclipse.jdt.debug: master
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java17.php
index a5afac30a..a5afac30a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java16.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.template_java17.php

Back to the top