Skip to content

Commit ab244ce

Browse files
committed
Revert "Fast incremental build"
Don't change production This reverts commit 0750dd8.
1 parent c5af6da commit ab244ce

File tree

4 files changed

+35
-6
lines changed

4 files changed

+35
-6
lines changed

Jenkinsfile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,41 @@ axes.values().combinations {
216216
}
217217
}
218218

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+
219254
builds.failFast = failFast
220255
parallel builds
221256
infra.maybePublishIncrementals()

cli/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
<mina-sshd.version>2.16.0</mina-sshd.version>
1919
<!-- Filled in by jacoco-maven-plugin -->
2020
<jacocoSurefireArgs />
21-
<!-- Intentionally run only one test to reduce cycle time -->
22-
<test>QuotedStringTokenizerTest</test>
2321
</properties>
2422

2523
<dependencyManagement>

core/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ THE SOFTWARE.
4343
<remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
4444
<!-- Filled in by jacoco-maven-plugin -->
4545
<jacocoSurefireArgs />
46-
<!-- Intentionally run only one test to reduce cycle time -->
47-
<test>EnvVarsTest</test>
4846
</properties>
4947

5048
<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-
<!-- Intentionally run only specific tests to reduce cycle time -->
56-
<test>DirectoryBrowserSupportTest,ArtifactArchiverTest</test>
5755
</properties>
5856

5957
<dependencyManagement>

0 commit comments

Comments
 (0)