Skip to content

Commit

Permalink
CORE-16283: Resolve the notary cpb for workflow tests using the csde-…
Browse files Browse the repository at this point in the history
…gradle-plugin (#111)

* CORE-16283: Resolve the notary cpb for workflow tests using the csde-gradle-plugin

* CORE-16283: Add missing csde config update

* CORE-16283: depend on full filepath for notary

* CORE-16818: Remove duplicated tasks being invoked (#115)
  • Loading branch information
tlawson3 authored Sep 1, 2023
1 parent 8c646b0 commit a5c0d6b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ allprojects {
combinedWorkerVersion = combinedWorkerJarVersion
postgresJdbcVersion = "42.4.3"
cordaDbContainerName = "CSDEpostgresql"
cordaBinDir = "${System.getProperty("user.home")}/.corda/corda5"
cordaCliBinDir = "${System.getProperty("user.home")}/.corda/cli"
cordaBinDir = "${System.getProperty("user.home")}/$cordaBinariesDirectory"
cordaCliBinDir = "${System.getProperty("user.home")}/$cordaCliBinariesDirectory"
cpiUploadTimeout = cpiUploadDefault
cordaProcessorTimeout = processorTimeout
vnodeRegistrationTimeout = vnodeRegistrationTimeoutDefault
Expand Down
8 changes: 8 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ workflowsModule=workflows
# This will be the name of the generated cpk and cpb files
contractsModule=contracts

# Specify the location of where Corda 5 binaries can be downloaded
# Relative path from user.home
cordaBinariesDirectory = .corda/corda5

# Specify the location of where Corda 5 CLI binaries can be downloaded
# Relative path from user.home
cordaCliBinariesDirectory = .corda/cli

# Metadata for the CorDapp.
cordappLicense="Apache License, Version 2.0"
cordappVendorName="R3"
Expand Down
3 changes: 2 additions & 1 deletion workflows/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ dependencies {
testImplementation "net.corda:corda-driver:$cordaDriverVersion"
testRuntimeOnly "net.corda:corda-driver-engine:$cordaDriverVersion"
testRuntimeOnly files(configurations.archives.artifacts.files)
testRuntimeOnly "com.r3.corda.notary.plugin.nonvalidating:notary-plugin-non-validating-server:$cordaNotaryPluginsVersion:package@cpb"
testRuntimeOnly files("${System.getProperty("user.home")}/$cordaBinariesDirectory/notaryServer/notary-plugin-non-validating-server-$cordaNotaryPluginsVersion-package.cpb")
}

tasks.withType(Test).configureEach {
dependsOn(':getNotaryServerCPB')
doFirst {
jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
'--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
Expand Down

0 comments on commit a5c0d6b

Please sign in to comment.