From a8ae7fdd6aaa2fa8a7c54be3932afcae0f556601 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Tue, 24 Nov 2020 17:36:53 +0000 Subject: [PATCH 1/8] INFRA-1009 Update Docker publication tasks (#6818) --- .ci/dev/publish-branch/Jenkinsfile.nightly | 8 +++++++- .ci/dev/regression/Jenkinsfile | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.ci/dev/publish-branch/Jenkinsfile.nightly b/.ci/dev/publish-branch/Jenkinsfile.nightly index 4b331e9f5d..18b6ee0a7f 100644 --- a/.ci/dev/publish-branch/Jenkinsfile.nightly +++ b/.ci/dev/publish-branch/Jenkinsfile.nightly @@ -119,7 +119,13 @@ pipeline { usernamePassword(credentialsId: 'corda-publisher-docker-hub-credentials', usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) { - sh "./gradlew pushOfficialImages" + sh script: [ + './gradlew', + COMMON_GRADLE_PARAMS, + 'docker:pushDockerImage', + '-Pdocker.image.repository=corda/corda', + '--image ALPINE_ZULU' + ].join(' ') } } } diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index fb6e3896ff..cd9f3f295d 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -286,7 +286,9 @@ pipeline { sh script: [ './gradlew', COMMON_GRADLE_PARAMS, - 'pushOfficialImages' + 'docker:pushDockerImage', + '-Pdocker.image.repository=corda/corda', + '--image ALPINE_ZULU' ].join(' ') } } From 503644ca295c85847430b4e489716dd34da047a8 Mon Sep 17 00:00:00 2001 From: Denis Rekalov Date: Tue, 24 Nov 2020 20:03:36 +0000 Subject: [PATCH 2/8] CORDA-4083: Fix Postresql migration, synch migration scripts from ENT (#6817) --- .../upgrade/ContractUpgradeServiceImpl.kt | 2 +- .../migration/node-core.changelog-v21.xml | 34 ++++++ .../migration/node-notary.changelog-v4.xml | 24 ++++ .../notary-bft-smart.changelog-v2.xml | 26 +++++ .../migration/notary-raft.changelog-v2.xml | 26 ++++- .../vault-schema.changelog-master.xml | 2 +- .../migration/vault-schema.changelog-v12.xml | 29 ----- .../migration/vault-schema.changelog-v13.xml | 103 ++++++++++++++++++ .../node/utilities/PersistentMapTests.kt | 16 +++ 9 files changed, 227 insertions(+), 35 deletions(-) delete mode 100644 node/src/main/resources/migration/vault-schema.changelog-v12.xml create mode 100644 node/src/main/resources/migration/vault-schema.changelog-v13.xml diff --git a/node/src/main/kotlin/net/corda/node/services/upgrade/ContractUpgradeServiceImpl.kt b/node/src/main/kotlin/net/corda/node/services/upgrade/ContractUpgradeServiceImpl.kt index b28ef53b8a..351864a741 100644 --- a/node/src/main/kotlin/net/corda/node/services/upgrade/ContractUpgradeServiceImpl.kt +++ b/node/src/main/kotlin/net/corda/node/services/upgrade/ContractUpgradeServiceImpl.kt @@ -19,7 +19,7 @@ class ContractUpgradeServiceImpl(cacheFactory: NamedCacheFactory) : ContractUpgr @Table(name = "${NODE_DATABASE_PREFIX}contract_upgrades") class DBContractUpgrade( @Id - @Column(name = "state_ref", length = 96, nullable = false) + @Column(name = "state_ref", length = 176, nullable = false) var stateRef: String = "", /** refers to the UpgradedContract class name*/ diff --git a/node/src/main/resources/migration/node-core.changelog-v21.xml b/node/src/main/resources/migration/node-core.changelog-v21.xml index 7773bc7f91..ee04567f1a 100644 --- a/node/src/main/resources/migration/node-core.changelog-v21.xml +++ b/node/src/main/resources/migration/node-core.changelog-v21.xml @@ -4,11 +4,45 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/node/src/main/resources/migration/node-notary.changelog-v4.xml b/node/src/main/resources/migration/node-notary.changelog-v4.xml index c2a15576ec..7cd5a8117d 100644 --- a/node/src/main/resources/migration/node-notary.changelog-v4.xml +++ b/node/src/main/resources/migration/node-notary.changelog-v4.xml @@ -4,6 +4,14 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> + + + + + + + + @@ -16,5 +24,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/node/src/main/resources/migration/notary-bft-smart.changelog-v2.xml b/node/src/main/resources/migration/notary-bft-smart.changelog-v2.xml index a63bc827ca..bc62adb0fe 100644 --- a/node/src/main/resources/migration/notary-bft-smart.changelog-v2.xml +++ b/node/src/main/resources/migration/notary-bft-smart.changelog-v2.xml @@ -4,6 +4,14 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> + + + + + + + + @@ -13,5 +21,23 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/node/src/main/resources/migration/notary-raft.changelog-v2.xml b/node/src/main/resources/migration/notary-raft.changelog-v2.xml index ddb0db5742..10b7d76452 100644 --- a/node/src/main/resources/migration/notary-raft.changelog-v2.xml +++ b/node/src/main/resources/migration/notary-raft.changelog-v2.xml @@ -4,16 +4,34 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd" logicalFilePath="migration/node-services.changelog-init.xml"> - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/node/src/main/resources/migration/vault-schema.changelog-master.xml b/node/src/main/resources/migration/vault-schema.changelog-master.xml index d3616c5c0c..44684647fa 100644 --- a/node/src/main/resources/migration/vault-schema.changelog-master.xml +++ b/node/src/main/resources/migration/vault-schema.changelog-master.xml @@ -12,5 +12,5 @@ - + diff --git a/node/src/main/resources/migration/vault-schema.changelog-v12.xml b/node/src/main/resources/migration/vault-schema.changelog-v12.xml deleted file mode 100644 index 8dc736a149..0000000000 --- a/node/src/main/resources/migration/vault-schema.changelog-v12.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/node/src/main/resources/migration/vault-schema.changelog-v13.xml b/node/src/main/resources/migration/vault-schema.changelog-v13.xml new file mode 100644 index 0000000000..beb66dba82 --- /dev/null +++ b/node/src/main/resources/migration/vault-schema.changelog-v13.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + state_party.public_key_hash, + state_party.transaction_id, + state_party.output_index, + pk_hash_to_ext_id_map.external_id + from state_party + join pk_hash_to_ext_id_map + on state_party.public_key_hash = pk_hash_to_ext_id_map.public_key_hash + + + \ No newline at end of file diff --git a/node/src/test/kotlin/net/corda/node/utilities/PersistentMapTests.kt b/node/src/test/kotlin/net/corda/node/utilities/PersistentMapTests.kt index f2d08608cf..3f15c6d298 100644 --- a/node/src/test/kotlin/net/corda/node/utilities/PersistentMapTests.kt +++ b/node/src/test/kotlin/net/corda/node/utilities/PersistentMapTests.kt @@ -47,6 +47,22 @@ class PersistentMapTests { } } + @Test(timeout=300_000) + fun `make sure persistence works with SHA-512`() { + val testHash = SecureHash.random(SecureHash.SHA2_512).toString() + + database.transaction { + val map = createTestMap() + map[testHash] = "test" + assertEquals(map[testHash], "test") + } + + database.transaction { + val reloadedMap = createTestMap() + assertEquals("test", reloadedMap[testHash]) + } + } + @Test(timeout=300_000) fun `make sure persistence works using assignment operator`() { val testHash = SecureHash.randomSHA256().toString() From 86aa0c4252821b61dc7fdb3484a882d62352ef56 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Thu, 26 Nov 2020 10:31:50 +0000 Subject: [PATCH 3/8] INFRA-1009 Remove undefined COMMON_GRADLE_PARAMS (#6819) --- .ci/dev/publish-branch/Jenkinsfile.nightly | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/dev/publish-branch/Jenkinsfile.nightly b/.ci/dev/publish-branch/Jenkinsfile.nightly index 18b6ee0a7f..33770de441 100644 --- a/.ci/dev/publish-branch/Jenkinsfile.nightly +++ b/.ci/dev/publish-branch/Jenkinsfile.nightly @@ -121,7 +121,6 @@ pipeline { passwordVariable: 'DOCKER_PASSWORD')]) { sh script: [ './gradlew', - COMMON_GRADLE_PARAMS, 'docker:pushDockerImage', '-Pdocker.image.repository=corda/corda', '--image ALPINE_ZULU' From d9e322057709a9b44aee118abd35a15ac4dd7237 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Thu, 26 Nov 2020 13:47:35 +0000 Subject: [PATCH 4/8] NOTICK Switch published Docker image to official (#6824) --- .ci/dev/publish-branch/Jenkinsfile.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/dev/publish-branch/Jenkinsfile.nightly b/.ci/dev/publish-branch/Jenkinsfile.nightly index 33770de441..f0cff55966 100644 --- a/.ci/dev/publish-branch/Jenkinsfile.nightly +++ b/.ci/dev/publish-branch/Jenkinsfile.nightly @@ -123,7 +123,7 @@ pipeline { './gradlew', 'docker:pushDockerImage', '-Pdocker.image.repository=corda/corda', - '--image ALPINE_ZULU' + '--image OFFICIAL' ].join(' ') } } From 17b0edffd1c8b05e07c4ab45fef71d26d52f9df7 Mon Sep 17 00:00:00 2001 From: Edoardo Ierina Date: Fri, 27 Nov 2020 12:16:50 +0000 Subject: [PATCH 5/8] restored cash changelog v1 to its original state (#6822) --- .../src/main/resources/migration/cash.changelog-v1.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/finance/workflows/src/main/resources/migration/cash.changelog-v1.xml b/finance/workflows/src/main/resources/migration/cash.changelog-v1.xml index 1f8e2c6635..ca6fd91a75 100644 --- a/finance/workflows/src/main/resources/migration/cash.changelog-v1.xml +++ b/finance/workflows/src/main/resources/migration/cash.changelog-v1.xml @@ -2,7 +2,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd" + logicalFilePath="migration/node-services.changelog-init.xml"> From dce0e581e79f9ac66856ba4c63799c7cd2696665 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Mon, 30 Nov 2020 22:30:29 +0000 Subject: [PATCH 6/8] INFRA-1033 Publish RCs to DockerHub (#6829) --- .ci/dev/regression/Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index cd9f3f295d..7f3c5cfd3d 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -275,7 +275,8 @@ pipeline { stage('Publish Release to Docker Hub') { when { - expression { isReleaseTag && !isInternalRelease && !isReleaseCandidate} + /* Note we do publish release tags, unlike Corda Enterprise */ + expression { !isInternalRelease && isReleaseTag } } steps { withCredentials([ @@ -288,7 +289,7 @@ pipeline { COMMON_GRADLE_PARAMS, 'docker:pushDockerImage', '-Pdocker.image.repository=corda/corda', - '--image ALPINE_ZULU' + '--image OFFICIAL' ].join(' ') } } From 534bccc88d8f98c9498181c85ea4cb312b117036 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Wed, 2 Dec 2020 16:26:15 +0000 Subject: [PATCH 7/8] INFRA-1038 Publish RC/HC builds to internal repo (#6830) Publish RC/HC builds to internal repo instead of DockerHub. --- .ci/dev/regression/Jenkinsfile | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index 7f3c5cfd3d..4bd288bb20 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -273,10 +273,30 @@ pipeline { } } + stage('Publish Release Candidate to Internal Repository') { + when { + expression { isReleaseCandidate } + } + steps { + withCredentials([ + usernamePassword(credentialsId: 'docker-image-pusher-os', + usernameVariable: 'DOCKER_USERNAME', + passwordVariable: 'DOCKER_PASSWORD') + ]) { + sh script: [ + './gradlew', + COMMON_GRADLE_PARAMS, + 'docker:pushDockerImage', + '--image OFFICIAL', + '--registry-url=entdocker.software.r3.com' + ].join(' ') + } + } + } + stage('Publish Release to Docker Hub') { when { - /* Note we do publish release tags, unlike Corda Enterprise */ - expression { !isInternalRelease && isReleaseTag } + expression { isReleaseTag && !isInternalRelease && !isReleaseCandidate} } steps { withCredentials([ From 62fe4bc65aa525af2f1465bfbc86618da28c32d3 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Thu, 3 Dec 2020 21:42:57 +0000 Subject: [PATCH 8/8] NOTICK Publish to correct Docker repository (#6831) --- .ci/dev/regression/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index 4bd288bb20..4a08d54fe7 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -286,6 +286,7 @@ pipeline { sh script: [ './gradlew', COMMON_GRADLE_PARAMS, + '-Pdocker.image.repository=entdocker.software.r3.com/corda', 'docker:pushDockerImage', '--image OFFICIAL', '--registry-url=entdocker.software.r3.com'