Skip to content

Commit 605aa06

Browse files
mickaelistriarobstryker
mickaelistria
authored and
robstryker
committed
Remove javac stuff
1 parent 8e8d5b6 commit 605aa06

File tree

2 files changed

+77
-26
lines changed

2 files changed

+77
-26
lines changed

‎Jenkinsfile‎

Lines changed: 77 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,88 @@ pipeline {
1313
jdk 'openjdk-jdk25-latest'
1414
}
1515
stages {
16-
stage('javac specific tests') {
16+
stage('Build and install forked tests') {
1717
steps {
1818
sh """#!/bin/bash -x
19-
mkdir -p $WORKSPACE/tmp
20-
21-
unset JAVA_TOOL_OPTIONS
22-
unset _JAVA_OPTIONS
23-
# force qualifier to start with `z` so we identify it more easily and it always seem more recent than upstrea
24-
mvn install -DskipTests -Djava.io.tmpdir=$WORKSPACE/tmp -Dmaven.repo.local=$WORKSPACE/.m2/repository \
25-
-Pbree-libs \
26-
-Dtycho.buildqualifier.format="'z'yyyyMMdd-HHmm" \
27-
-Pp2-repo \
28-
-Djava.io.tmpdir=$WORKSPACE/tmp -Dproject.build.sourceEncoding=UTF-8 \
29-
-pl org.eclipse.jdt.core.javac,org.eclipse.jdt.core.javac.configurator,org.eclipse.jdt.javac.ui,org.eclipse.jdt.javac.feature,org.eclipse.jdt.core.tests.model,org.eclipse.jdt.core.tests.compiler,repository
30-
31-
mvn verify --batch-mode -pl org.eclipse.jdt.core.compiler.batch,org.eclipse.jdt.core,org.eclipse.jdt.core.tests.javac -Dmaven.repo.local=$WORKSPACE/.m2/repository \
32-
--fail-at-end -Ptest-on-javase-25 -Pbree-libs \
33-
-DfailIfNoTests=false -DexcludedGroups=org.junit.Ignore -DproviderHint=junit47 \
34-
-Papi-check -Djava.io.tmpdir=$WORKSPACE/tmp -Dproject.build.sourceEncoding=UTF-8 \
35-
-Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true
36-
"""
19+
mkdir -p $WORKSPACE/tmp
20+
21+
unset JAVA_TOOL_OPTIONS
22+
unset _JAVA_OPTIONS
23+
# force qualifier to start with `z` so we identify it more easily and it always seem more recent than upstrea
24+
mvn install -Djava.io.tmpdir=$WORKSPACE/tmp -Dmaven.repo.local=$WORKSPACE/.m2/repository \
25+
-Pbree-libs \
26+
-Dtycho.buildqualifier.format="'z'yyyyMMdd-HHmm" \
27+
-Pp2-repo \
28+
-Djava.io.tmpdir=$WORKSPACE/tmp -Dproject.build.sourceEncoding=UTF-8 \
29+
-DskipTests \
30+
-pl org.eclipse.jdt.core.tests.compiler,org.eclipse.jdt.core.tests.model
31+
"""
32+
}
33+
}
34+
stage('Create composite repo') {
35+
steps {
36+
dir('repository/target/repository') {
37+
writeFile file: 'compositeContent.xml', text: """
38+
<?xml version='1.0' encoding='UTF-8'?>
39+
<?compositeMetadataRepository version='1.0.0'?>
40+
<repository name='Proxy JDT over Javac p2 repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1'>
41+
<properties size='3'>
42+
<property name='p2.timestamp' value='1764168641397'/>
43+
<property name='p2.compressed' value='true'/>
44+
<property name='p2.atomic.composite.loading' value='true'/>
45+
</properties>
46+
<children size='1'>
47+
<child location='https://ci.eclipse.org/ls/job/eclipse.jdt.javac/job/main/lastSuccessfulBuild/artifact/repository/target/repository/'/>
48+
</children>
49+
</repository>
50+
"""
51+
writeFile file: 'compositeArtiacts.xml', text: """
52+
<?xml version='1.0' encoding='UTF-8'?>
53+
<?compositeArtifactRepository version='1.0.0'?>
54+
<repository name='Proxy JDT over Javac p2 repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1'>
55+
<properties size='3'>
56+
<property name='p2.timestamp' value='1764168641397'/>
57+
<property name='p2.compressed' value='true'/>
58+
<property name='p2.atomic.composite.loading' value='true'/>
59+
</properties>
60+
<children size='1'>
61+
<child location='https://ci.eclipse.org/ls/job/eclipse.jdt.javac/job/main/lastSuccessfulBuild/artifact/repository/target/repository/'/>
62+
</children>
63+
</repository>
64+
"""
65+
}
66+
}
67+
post {
68+
always {
69+
archiveArtifacts artifacts: 'repository/target/repository/**'
70+
}
71+
}
72+
}
73+
stage('Fetch and tests Javac-based JDT') {
74+
steps {
75+
dir('eclipse.jdt.javac') {
76+
checkout scmGit(
77+
branches: [[name: 'main']],
78+
extensions: [ cloneOption(shallow: true) ],
79+
userRemoteConfigs: [[url: 'https://github.com/eclipse-jdtls/eclipse.jdt.javac.git']])
80+
sh """#!/bin/bash -x
81+
mkdir -p $WORKSPACE/tmp
82+
83+
unset JAVA_TOOL_OPTIONS
84+
unset _JAVA_OPTIONS
85+
# force qualifier to start with `z` so we identify it more easily and it always seem more recent than upstrea
86+
mvn verify --batch-mode -Djava.io.tmpdir=$WORKSPACE/tmp -Dmaven.repo.local=$WORKSPACE/.m2/repository \
87+
-Dtycho.buildqualifier.format="'z'yyyyMMdd-HHmm" \
88+
-Djava.io.tmpdir=$WORKSPACE/tmp -Dproject.build.sourceEncoding=UTF-8 \
89+
--fail-at-end -Ptest-on-javase-25 -Pbree-libs -DfailIfNoTests=false -DexcludedGroups=org.junit.Ignore -DproviderHint=junit47 \
90+
-Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true
91+
"""
92+
}
3793
}
3894
post {
3995
always {
40-
archiveArtifacts artifacts: '*.log,*/target/work/data/.metadata/*.log,*/tests/target/work/data/.metadata/*.log,apiAnalyzer-workspace/.metadata/*.log,repository/target/repository/**,**/target/artifactcomparison/**', allowEmptyArchive: true
41-
junit 'org.eclipse.jdt.core.tests.javac/target/surefire-reports/*.xml'
96+
archiveArtifacts artifacts: '*.log,eclipse.jdt.javac/*/target/work/data/.metadata/*.log,*/tests/target/work/data/.metadata/*.log,apiAnalyzer-workspace/.metadata/*.log,repository/target/repository/**,**/target/artifactcomparison/**', allowEmptyArchive: true
97+
junit 'eclipse.jdt.javac/org.eclipse.jdt.core.tests.javac/target/surefire-reports/*.xml'
4298
discoverGitReferenceBuild referenceJob: 'jdt-core-incubator/dom-with-javac'
4399
//recordIssues ignoreQualityGate:true, tool: junitParser(pattern: 'org.eclipse.jdt.core.tests.javac/target/surefire-reports/*.xml'), qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
44100
}

‎pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,11 @@
6060
<module>org.eclipse.jdt.annotation</module>
6161
<module>org.eclipse.jdt.core.compiler.batch</module>
6262
<module>org.eclipse.jdt.core</module>
63-
<module>org.eclipse.jdt.core.javac</module>
64-
<module>org.eclipse.jdt.core.javac.configurator</module>
65-
<module>org.eclipse.jdt.javac.ui</module>
66-
<module>org.eclipse.jdt.javac.feature</module>
6763
<module>org.eclipse.jdt.core.formatterapp</module>
6864
<module>org.eclipse.jdt.compiler.tool.tests</module>
6965
<module>org.eclipse.jdt.core.tests.builder.mockcompiler</module>
7066
<module>org.eclipse.jdt.core.tests.builder</module>
7167
<module>org.eclipse.jdt.core.tests.compiler</module>
72-
<module>org.eclipse.jdt.core.tests.javac</module>
7368
<module>org.eclipse.jdt.core.tests.model</module>
7469
<module>org.eclipse.jdt.core.tests.performance</module>
7570
<module>org.eclipse.jdt.apt.core</module>

0 commit comments

Comments
 (0)