Skip to content

Commit be31ac8

Browse files
donatdonat
committed
Add test CI coverage for Eclipse 4.16
1 parent 5d324c3 commit be31ac8

File tree

10 files changed

+169
-24
lines changed

10 files changed

+169
-24
lines changed

‎.teamcity/Buildship/Check30/Checkpoints/buildTypes/FullTestCoverage.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ object FullTestCoverage : BuildType({
4545
snapshot(Buildship.Check30.FullTestCoverage.Linux.buildTypes.Eclipse413, CheckpointUtils.DefaultFailureCondition)
4646
snapshot(Buildship.Check30.FullTestCoverage.Linux.buildTypes.Eclipse414, CheckpointUtils.DefaultFailureCondition)
4747
snapshot(Buildship.Check30.FullTestCoverage.Linux.buildTypes.Eclipse415, CheckpointUtils.DefaultFailureCondition)
48+
snapshot(Buildship.Check30.FullTestCoverage.Linux.buildTypes.Eclipse416, CheckpointUtils.DefaultFailureCondition)
4849
snapshot(Buildship.Check30.FullTestCoverage.Windows.buildTypes.Eclipse44, CheckpointUtils.DefaultFailureCondition)
4950
snapshot(Buildship.Check30.FullTestCoverage.Windows.buildTypes.Eclipse47, CheckpointUtils.DefaultFailureCondition)
5051
}

‎.teamcity/Buildship/Check30/FullTestCoverage/Linux/Project.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ object Project : Project({
1919
buildType(Eclipse413)
2020
buildType(Eclipse414)
2121
buildType(Eclipse415)
22+
buildType(Eclipse416)
2223
})

‎.teamcity/Buildship/Check30/FullTestCoverage/Linux/buildTypes/Eclipse416.kt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package Buildship.Check30.FullTestCoverage.Linux.buildTypes
2+
3+
import Buildship.Check30.Checkpoints.buildTypes.BasicTestCoverage
4+
import Buildship.EclipseBuildTemplate
5+
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
6+
import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
7+
8+
object Eclipse416 : BuildType({
9+
id("Full_Test_Coverage_Linux_Eclipse416_Java8_30")
10+
name = "Full Test Coverage (Linux, Eclipse 2020-06, Java 8)"
11+
12+
templates(EclipseBuildTemplate)
13+
14+
params {
15+
param("eclipse.version", "416")
16+
param("compiler.location", "%linux.java8.oracle.64bit%/bin/javac")
17+
param("eclipse.test.java.home", "%linux.java8.oracle.64bit%")
18+
param("env.JAVA_HOME", "%linux.java8.oracle.64bit%")
19+
}
20+
21+
dependencies {
22+
snapshot(BasicTestCoverage) {
23+
onDependencyFailure = FailureAction.CANCEL
24+
onDependencyCancel = FailureAction.CANCEL
25+
}
26+
}
27+
28+
requirements {
29+
contains("teamcity.agent.jvm.os.name", "Linux", "RQ_650")
30+
}
31+
})

‎.teamcity/Buildship/EclipseBuildTemplate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object EclipseBuildTemplate : Template({
2020
param("eclipse.test.java.home", "%env.JAVA_HOME%")
2121
param("gradle.tasks", "clean build")
2222
param("env.JAVA_HOME", "%linux.java7.oracle.64bit%")
23-
param("eclipsetest.mirrors", "jcenter:http://dev12.gradle.org:8081/artifactory/jcenter")
23+
param("eclipsetest.mirrors", "jcenter:https://dev12.gradle.org/artifactory/jcenter")
2424
param("enable.oomph.plugin", "true")
2525
}
2626

‎.teamcity/Buildship/Promotion30/buildTypes/Milestone.kt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,19 @@ object Milestone : BuildType({
197197
"-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
198198
""".trimIndent()
199199
}
200+
201+
gradle {
202+
name = "Build and upload update site for Eclipse 2020-06"
203+
tasks = "clean build uploadUpdateSite"
204+
buildFile = ""
205+
gradleParams = """
206+
--exclude-task eclipseTest
207+
-Peclipse.version=416 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
208+
--stacktrace -Declipse.p2.mirror=false
209+
"-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
210+
"-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
211+
"-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
212+
""".trimIndent()
213+
}
200214
}
201215
})

‎.teamcity/Buildship/Promotion30/buildTypes/Release.kt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,20 @@ object Release : BuildType({
197197
""".trimIndent()
198198
}
199199

200+
gradle {
201+
name = "Build and upload update site for Eclipse 2020-06"
202+
tasks = "clean build uploadUpdateSite"
203+
buildFile = ""
204+
gradleParams = """
205+
--exclude-task eclipseTest
206+
-Peclipse.version=416 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
207+
--stacktrace -Declipse.p2.mirror=false
208+
"-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
209+
"-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
210+
"-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
211+
""".trimIndent()
212+
}
213+
200214
gradle {
201215
name = "Tag revision and increment version number"
202216
tasks = "tag incrementVersion"

‎.teamcity/Buildship/Promotion30/buildTypes/Snapshot.kt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,20 @@ object Snapshot : BuildType({
196196
"-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
197197
""".trimIndent()
198198
}
199+
200+
gradle {
201+
name = "Build and upload update site for Eclipse 2020-06"
202+
tasks = "clean build uploadUpdateSite"
203+
buildFile = ""
204+
gradleParams = """
205+
--exclude-task eclipseTest
206+
-Peclipse.version=416 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
207+
--stacktrace -Declipse.p2.mirror=false
208+
"-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
209+
"-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
210+
"-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
211+
""".trimIndent()
212+
}
199213
}
200214

201215
triggers {

‎Launch Buildship.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
1919
</listAttribute>
2020
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
21-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
21+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
2222
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
2323
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
2424
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=128M -Dorg.eclipse.swt.internal.carbon.smallFonts"/>

‎build.gradle

Lines changed: 65 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def eclipseVersionAgnosticDependencies = [
3333
// the default version is 48 which can be overridden through -Peclipse.version=<version>
3434
// also the target platforms contain 1) the Eclipse SDK 2) the latest junit 3) SWTBot 2.2.1
3535
eclipseBuild {
36-
defaultEclipseVersion = '415'
36+
defaultEclipseVersion = '416'
3737

3838
final def swtPluginId = "org.eclipse.swt.${ECLIPSE_WS}.${ECLIPSE_OS}.${ECLIPSE_ARCH}"
3939

@@ -275,9 +275,9 @@ eclipseBuild {
275275
'org.junit' : '4.12.0',
276276
'org.eclipse.emf.ecore' : '2.21.0',
277277
'org.eclipse.emf.edit' : '2.16.0',
278-
'org.eclipse.oomph.resources' : '1.12.0',
279-
'org.eclipse.oomph.resources.edit' : '1.10.0',
280-
'org.eclipse.oomph.predicates' : '1.11.0',
278+
'org.eclipse.oomph.resources' : '1.14.0',
279+
'org.eclipse.oomph.resources.edit' : '1.11.0',
280+
'org.eclipse.oomph.predicates' : '1.12.0',
281281
'org.eclipse.oomph.predicates.edit' : '1.10.0',
282282
'org.eclipse.oomph.setup' : '1.10.0',
283283
'org.eclipse.oomph.setup.core' : '1.10.0',
@@ -318,9 +318,9 @@ eclipseBuild {
318318
'org.junit' : '4.12.0',
319319
'org.eclipse.emf.ecore' : '2.21.0',
320320
'org.eclipse.emf.edit' : '2.16.0',
321-
'org.eclipse.oomph.resources' : '1.12.0',
322-
'org.eclipse.oomph.resources.edit' : '1.10.0',
323-
'org.eclipse.oomph.predicates' : '1.11.0',
321+
'org.eclipse.oomph.resources' : '1.14.0',
322+
'org.eclipse.oomph.resources.edit' : '1.11.0',
323+
'org.eclipse.oomph.predicates' : '1.12.0',
324324
'org.eclipse.oomph.predicates.edit' : '1.10.0',
325325
'org.eclipse.oomph.setup' : '1.10.0',
326326
'org.eclipse.oomph.setup.core' : '1.11.0',
@@ -361,9 +361,9 @@ eclipseBuild {
361361
'org.junit' : '4.12.0',
362362
'org.eclipse.emf.ecore' : '2.21.0',
363363
'org.eclipse.emf.edit' : '2.16.0',
364-
'org.eclipse.oomph.resources' : '1.12.0',
365-
'org.eclipse.oomph.resources.edit' : '1.10.0',
366-
'org.eclipse.oomph.predicates' : '1.11.0',
364+
'org.eclipse.oomph.resources' : '1.14.0',
365+
'org.eclipse.oomph.resources.edit' : '1.11.0',
366+
'org.eclipse.oomph.predicates' : '1.12.0',
367367
'org.eclipse.oomph.predicates.edit' : '1.10.0',
368368
'org.eclipse.oomph.setup' : '1.12.0',
369369
'org.eclipse.oomph.setup.core' : '1.12.0',
@@ -404,9 +404,9 @@ eclipseBuild {
404404
'org.junit' : '4.12.0',
405405
'org.eclipse.emf.ecore' : '2.21.0',
406406
'org.eclipse.emf.edit' : '2.16.0',
407-
'org.eclipse.oomph.resources' : '1.12.0',
408-
'org.eclipse.oomph.resources.edit' : '1.10.0',
409-
'org.eclipse.oomph.predicates' : '1.11.0',
407+
'org.eclipse.oomph.resources' : '1.14.0',
408+
'org.eclipse.oomph.resources.edit' : '1.11.0',
409+
'org.eclipse.oomph.predicates' : '1.12.0',
410410
'org.eclipse.oomph.predicates.edit' : '1.10.0',
411411
'org.eclipse.oomph.setup' : '1.13.0',
412412
'org.eclipse.oomph.setup.core' : '1.13.0',
@@ -447,9 +447,9 @@ eclipseBuild {
447447
'org.junit' : '4.12.0',
448448
'org.eclipse.emf.ecore' : '2.21.0',
449449
'org.eclipse.emf.edit' : '2.16.0',
450-
'org.eclipse.oomph.resources' : '1.12.0',
451-
'org.eclipse.oomph.resources.edit' : '1.10.0',
452-
'org.eclipse.oomph.predicates' : '1.11.0',
450+
'org.eclipse.oomph.resources' : '1.14.0',
451+
'org.eclipse.oomph.resources.edit' : '1.11.0',
452+
'org.eclipse.oomph.predicates' : '1.12.0',
453453
'org.eclipse.oomph.predicates.edit' : '1.10.0',
454454
'org.eclipse.oomph.setup' : '1.14.0',
455455
'org.eclipse.oomph.setup.core' : '1.14.0',
@@ -490,9 +490,9 @@ eclipseBuild {
490490
'org.junit' : '4.12.0',
491491
'org.eclipse.emf.ecore' : '2.20.0',
492492
'org.eclipse.emf.edit' : '2.16.0',
493-
'org.eclipse.oomph.resources' : '1.12.0',
494-
'org.eclipse.oomph.resources.edit' : '1.10.0',
495-
'org.eclipse.oomph.predicates' : '1.11.0',
493+
'org.eclipse.oomph.resources' : '1.14.0',
494+
'org.eclipse.oomph.resources.edit' : '1.11.0',
495+
'org.eclipse.oomph.predicates' : '1.12.0',
496496
'org.eclipse.oomph.predicates.edit' : '1.10.0',
497497
'org.eclipse.oomph.setup' : '1.15.0',
498498
'org.eclipse.oomph.setup.core' : '1.15.0',
@@ -534,9 +534,9 @@ eclipseBuild {
534534
'org.junit' : '4.12.0',
535535
'org.eclipse.emf.ecore' : '2.21.0',
536536
'org.eclipse.emf.edit' : '2.16.0',
537-
'org.eclipse.oomph.resources' : '1.12.0',
538-
'org.eclipse.oomph.resources.edit' : '1.10.0',
539-
'org.eclipse.oomph.predicates' : '1.11.0',
537+
'org.eclipse.oomph.resources' : '1.14.0',
538+
'org.eclipse.oomph.resources.edit' : '1.11.0',
539+
'org.eclipse.oomph.predicates' : '1.12.0',
540540
'org.eclipse.oomph.predicates.edit' : '1.10.0',
541541
'org.eclipse.oomph.setup' : '1.16.0',
542542
'org.eclipse.oomph.setup.core' : '1.16.0',
@@ -545,6 +545,49 @@ eclipseBuild {
545545
'org.eclipse.oomph.base.edit' : '1.12.0'
546546
]
547547
}
548+
549+
targetPlatform {
550+
eclipseVersion = '416'
551+
targetDefinition = file('tooling-e416.target')
552+
versionMapping = [
553+
"$swtPluginId" : '3.114.100',
554+
'com.ibm.icu' : '64.2.0',
555+
'org.eclipse.core.expressions' : '3.6.800',
556+
'org.eclipse.core.filesystem' : '1.7.700',
557+
'org.eclipse.core.net' : '1.3.900',
558+
'org.eclipse.core.resources' : '3.13.700',
559+
'org.eclipse.core.runtime' : '3.18.0',
560+
'org.eclipse.core.variables' : '3.4.800',
561+
'org.eclipse.debug.core' : '3.15.100',
562+
'org.eclipse.debug.ui' : '3.14.500',
563+
'org.eclipse.help' : '3.8.800',
564+
'org.eclipse.jdt.core' : '3.22.0',
565+
'org.eclipse.jdt.junit.core' : '3.10.700',
566+
'org.eclipse.jdt.launching' : '3.17.100',
567+
'org.eclipse.jdt.ui' : '3.21.100',
568+
'org.eclipse.jface.databinding' : '1.11.100',
569+
'org.eclipse.jface.text' : '3.16.300',
570+
'org.eclipse.ui' : '3.117.0',
571+
'org.eclipse.ui.console' : '3.9.200',
572+
'org.eclipse.ui.editors' : '3.13.200',
573+
'org.eclipse.ui.ide' : '3.17.100',
574+
'org.eclipse.ui.navigator' : '3.9.300',
575+
'org.eclipse.ui.views' : '3.10.300',
576+
'org.eclipse.ui.workbench.texteditor' : '3.14.200',
577+
'org.junit' : '4.12.0',
578+
'org.eclipse.emf.ecore' : '2.22.0',
579+
'org.eclipse.emf.edit' : '2.16.0',
580+
'org.eclipse.oomph.resources' : '1.14.0',
581+
'org.eclipse.oomph.resources.edit' : '1.11.0',
582+
'org.eclipse.oomph.predicates' : '1.12.0',
583+
'org.eclipse.oomph.predicates.edit' : '1.10.0',
584+
'org.eclipse.oomph.setup' : '1.17.0',
585+
'org.eclipse.oomph.setup.core' : '1.17.0',
586+
'org.eclipse.oomph.setup.edit' : '1.14.0',
587+
'org.eclipse.oomph.base' : '1.13.0',
588+
'org.eclipse.oomph.base.edit' : '1.12.0'
589+
]
590+
}
548591

549592
scmRepo = "https://github.com/eclipse/buildship.git"
550593
commitId = currentCommitId()

‎tooling-e416.target

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<target name="Buildship Eclipse 2020-06 Target Platform" sequenceNumber="1">
3+
<locations>
4+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
5+
<unit id="org.eclipse.m2e.feature.feature.group" version="1.16.0.20200610-1735"/>
6+
<unit id="org.eclipse.sdk.ide" version="4.16.0.I20200604-0540"/>
7+
<unit id="org.eclipse.oomph.setup.feature.group" version="1.17.0.v20200606-0914"/>
8+
<repository location="https://builds.gradle.org:8001/eclipse/update-site/mirror/releases-rolling"/>
9+
</location>
10+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
11+
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
12+
<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
13+
<unit id="org.junit" version="4.12.0.v201504281640"/>
14+
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
15+
<repository location="https://builds.gradle.org:8001/eclipse/update-site/mirror/orbit-rolling/"/>
16+
</location>
17+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
18+
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
19+
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>
20+
<repository location="https://builds.gradle.org:8001/eclipse/update-site/mirror/swtbot/release/"/>
21+
</location>
22+
</locations>
23+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
24+
<launcherArgs>
25+
<vmArgs>-XX:MaxPermSize=128M</vmArgs>
26+
</launcherArgs>
27+
</target>

0 commit comments

Comments
 (0)