From 3377df2212b32509825814677447ae2e5fb26334 Mon Sep 17 00:00:00 2001 From: Waldemar Zurowski Date: Sat, 20 Jun 2020 17:26:57 +0100 Subject: [PATCH 1/2] Switched to CMD for Windows Server * when using shell there are huge performance penalty --- .ci/dev/mswin/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/dev/mswin/Jenkinsfile b/.ci/dev/mswin/Jenkinsfile index ffbfbcb5d6..923a83ff85 100644 --- a/.ci/dev/mswin/Jenkinsfile +++ b/.ci/dev/mswin/Jenkinsfile @@ -55,7 +55,7 @@ pipeline { stage('Unit Tests') { agent { label 'mswin' } steps { - sh "./gradlew --no-daemon " + + bat "./gradlew --no-daemon " + "--stacktrace " + "-Pcompilation.warningsAsErrors=false " + "-Ptests.failFast=true " + @@ -80,7 +80,7 @@ pipeline { } agent { label 'mswin' } steps { - sh "./gradlew --no-daemon " + + bat "./gradlew --no-daemon " + "clean integrationTest" } post { From ef582900cf16ceb7e358b05802e8b69b0a0e8d99 Mon Sep 17 00:00:00 2001 From: Ryan Fowler Date: Thu, 25 Jun 2020 17:26:55 +0100 Subject: [PATCH 2/2] NOTICK Expand the regex to match what we already do in ENT (#6400) --- node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt b/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt index f59887f803..bceb35ecef 100644 --- a/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt @@ -11,7 +11,7 @@ import kotlin.test.assertEquals import kotlin.test.assertTrue class NodeRPCTests { - private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(-\\w+)?".toRegex() + private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(\\.\\d+)?(-\\w+)?".toRegex() private val CORDA_VENDOR = "Corda Open Source" private val CORDAPPS = listOf(FINANCE_CONTRACTS_CORDAPP, FINANCE_WORKFLOWS_CORDAPP) private val CORDAPP_TYPES = setOf("Contract CorDapp", "Workflow CorDapp")