Skip to content

Commit dd539ec

Browse files
committed
Revert "Fast incremental build"
This reverts commit 53a7b6f.
1 parent ff54607 commit dd539ec

File tree

4 files changed

+36
-10
lines changed

4 files changed

+36
-10
lines changed

Jenkinsfile

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ properties([
1313
])
1414

1515
def axes = [
16-
platforms: ['linux'],
16+
platforms: ['linux', 'windows'],
1717
jdks: [21, 25],
1818
]
1919

@@ -128,12 +128,7 @@ axes.values().combinations {
128128
}
129129
withChecks(name: 'Tests', includeStage: true) {
130130
realtimeJUnit(healthScaleFactor: 20.0, testResults: '*/target/surefire-reports/*.xml') {
131-
// Only use with replay, not with a commit
132-
// sh 'curl -O https://home.markwaite.net/~mwaite/test-pom.patch && git apply test-pom.patch && git diff'
133-
// mavenOptions.add(0, "-Dignore.dirt")
134131
infra.runMaven(mavenOptions, jdk)
135-
// Only use with replay, not with a commit
136-
// sh 'git checkout -- */pom.xml'
137132
if (isUnix()) {
138133
sh 'git add . && git diff --exit-code HEAD'
139134
}
@@ -221,6 +216,41 @@ axes.values().combinations {
221216
}
222217
}
223218

219+
def athAxes = [
220+
platforms: ['linux'],
221+
jdks: [21],
222+
browsers: ['firefox'],
223+
]
224+
athAxes.values().combinations {
225+
def (platform, jdk, browser) = it
226+
builds["ath-${platform}-jdk${jdk}-${browser}"] = {
227+
retry(conditions: [agent(), nonresumable()], count: 2) {
228+
node('docker-highmem') {
229+
// Just to be safe
230+
deleteDir()
231+
checkout scm
232+
233+
withChecks(name: 'Tests', includeStage: true) {
234+
infra.withArtifactCachingProxy {
235+
sh "bash ath.sh ${jdk} ${browser}"
236+
}
237+
junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
238+
}
239+
/*
240+
* Currently disabled, as the fact that this is a manually created subset will confuse Launchable,
241+
* which expects this to be a full build. When we implement subsetting, this can be re-enabled using
242+
* Launchable's subset rather than our own.
243+
*/
244+
/*
245+
withCredentials([string(credentialsId: 'launchable-jenkins-acceptance-test-harness', variable: 'LAUNCHABLE_TOKEN')]) {
246+
sh "launchable verify && launchable record tests --no-build --flavor platform=${platform} --flavor jdk=${jdk} --flavor browser=${browser} maven './target/ath-reports'"
247+
}
248+
*/
249+
}
250+
}
251+
}
252+
}
253+
224254
builds.failFast = failFast
225255
parallel builds
226256
infra.maybePublishIncrementals()

cli/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<mina-sshd.version>2.16.0</mina-sshd.version>
1919
<!-- Filled in by jacoco-maven-plugin -->
2020
<jacocoSurefireArgs />
21-
<test>QuotedStringTokenizerTest</test>
2221
</properties>
2322

2423
<dependencyManagement>

core/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ THE SOFTWARE.
4343
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
4444
<!-- Filled in by jacoco-maven-plugin -->
4545
<jacocoSurefireArgs />
46-
<test>EnvVarsTest</test>
4746
</properties>
4847

4948
<dependencyManagement>

test/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ THE SOFTWARE.
5252

5353
<!-- Filled in by maven-hpi-plugin with "-javaagent:/path/to/mockito-core-<version>.jar" -->
5454
<jenkins.javaAgent />
55-
56-
<test>hudson.AboutJenkinsTest</test>
5755
</properties>
5856

5957
<dependencyManagement>

0 commit comments

Comments
 (0)