Commit Graph

8177 Commits

Author SHA1 Message Date
e692ec292a Merge branch 'release/os/4.3' of https://github.com/corda/corda into EdP/CORDA-3446-4.4 2019-11-20 10:36:38 +00:00
ae8b5c1a96 CORDA-3446 finalizing transactions with only one participant (#5742)
CORDA-3446 finalizing transactions with only one participant (#5742)
2019-11-20 10:03:25 +00:00
926429647d CORDA-3307: Fix for underscore variables (#5682)
* Revert "Revert "CORDA-3307 - add support for environment variables in linux (#5523)" (#5643)"

This reverts commit 03ab258fc2.

* Env variables with underscore are now validated using schema validation and checking for unknown key errors.

* Resolving comments from PR review.

* Fix for deprecated import.

* Reworked logic according to PR review.

* Resolved bad string parsing problems where the json structure could be broken if some symbols were included in the key or value.
2019-11-19 17:51:52 +00:00
698909a1ac disable preallocation on regression builds (#5743) 2019-11-19 17:38:38 +00:00
c349ff719d NOTICK - Add ENUM to the C++ serialiser (#5616) 2019-11-19 16:00:11 +00:00
ce8ce2ba7c CORDA-2876: Upgrade to deterministic-rt 1.0-RC01. (#5738) 2019-11-19 15:02:35 +00:00
a791e38319 CORDA-3443: Do not log warning when appending duplicated network parameters (#5739) 2019-11-19 15:02:07 +00:00
138a2f114d Refresh token by invoking KubeCTL before each Kuberenetes API invocation (#5732)
* fix merge issue with sidecar image work

* add logic to refresh token in GKE

* set streaming to true

* set streaming to true

* set streaming to false, and increment number of workers for regression test as approaching 1h limit

* set PR build to run unit and integration tests

* try method distribution to see if faster

* rename test stage to reflect the fact it runs unit tests

* remove commented out parallel unit test code
2019-11-19 15:01:42 +00:00
890aaad898 [ENT-4430] - Remove infinite retrying from first attempt to establish a connection (#5737) 2019-11-19 15:01:01 +00:00
304b809d6b Updates for finalizing transactions with one participant 2019-11-19 14:32:33 +00:00
7abc1533ea CORDA-2963: Migrate deterministic-rt.jar into DJVM repository. (#5733) 2019-11-19 11:46:34 +00:00
5f819c1917 Merge pull request #5723 from corda/my_merge_branch
Merge OS4.3 -> OS4.4
2019-11-18 19:26:07 +00:00
221576d94a move - responding flow from suffix to prefix of test name (#5731) 2019-11-18 15:41:15 +00:00
4e7c8a6b1b revert api-current to 4.4 2019-11-18 14:04:06 +00:00
0864eae949 CORDA-2963: Add calendars.properties to deterministic-rt.jar. (#5730) 2019-11-18 13:54:51 +00:00
88b7950e9e Merge remote-tracking branch 'origin/release/os/4.4' into my_merge_branch 2019-11-18 13:47:07 +00:00
098177fad4 Merge remote-tracking branch 'origin/release/os/4.3' into my_merge_branch 2019-11-18 13:46:43 +00:00
831ca33ed5 try increase websocket timeout due to azure EOF exceptions (#5729) 2019-11-18 13:45:43 +00:00
129d8d1b34 NOTICK: Mention platform version change in release notes (#5721)
* NOTICK: Mention platform version change in release notes (#5721)

Update the release notes to mention the platform version change.

* NOTICK: Mention platform version change in release notes

Added mention of preserved wire stability and compatibility across different versions.

* Typo fixes

* Corrected typo in release notes.

* Reworded change according to feedback - greatly simplified it.

* Slight rewording
2019-11-18 12:42:25 +00:00
01fc4cc102 CORDA-2876: Upgrade DJVM to 1.0-RC03 (#5727)
CORDA-2876: Upgrade DJVM to 1.0-RC03 (#5727)
2019-11-18 11:39:47 +00:00
c68f8161fc CORDA-2876: Upgrade DJVM to 1.0-RC03. 2019-11-16 16:51:24 +00:00
052adc9791 fix merge issue with sidecar image work (#5724) 2019-11-15 17:31:58 +00:00
b11fd02f6e Merge remote-tracking branch 'origin/release/os/4.3' into my_merge_branch 2019-11-15 15:44:45 +00:00
a201a8d52b CORDA-2876: Fix serialization-djvm module for Java 11. (#5720) 2019-11-15 15:37:47 +00:00
01c1e4bc17 attempt to make preAllocation job deletion more certain (#5708)
fix issue with deallocate during build phase

fix test report URL
2019-11-15 15:14:01 +00:00
deed4e9763 Enable test retry in distributed testing (#5702)
* TM-88 only write the test to the file if it passes otherwise retry

* TM-88 1 failing test for testing purposes

* TM-88 fail an integration test instead of unit test

* TM-88 include failed test for retry

* TM-88 new logic for retrying failed tests

* TM-88 refactored to use retry class when dealing with test failures + copy results even after pod failure

* TM-88 remaining pods as set to prevent duplicates, limit retries to prevent crashed build and a bit more logging

* TM-88 atomic int instead of int array

* TM-88 moving atomic int outside retry loops

* TM-88 removing second retry as it is not needed

* TM-88 small fix to final copy

* TM-88 while loop to prevent destruction of results on test retry

* TM-88 removing shutdown hook

* TM-88 reverting to previous implementation

* TM-88 copying xml files before retry

* TM-88 removing fail
2019-11-15 15:07:23 +00:00
b48a714aaa TM-10 - Parallelise DB integration tests (postgres) (#5704) 2019-11-15 14:46:53 +00:00
f071445221 CORDA-2876: Ensure that sandboxable byte-code is compiled for Java 8. (#5718)
CORDA-2876: Ensure that sandboxable byte-code is compiled for Java 8. (#5718)
2019-11-15 08:46:22 +00:00
57bd5d5af2 NOTICK: Update API after release of 4.3 (#5717)
NOTICK: Update API after release of 4.3 (#5717)
2019-11-14 16:58:04 +00:00
b1aa9b0e17 Merge pull request #5716 from corda/FEAT-43-r4.4b
Merge release/os/4.3 -> release/os/4.4
2019-11-14 16:27:17 +00:00
b1c164e26d CORDA-2876: Ensure that sandboxable byte-code is compiled for Java 8. 2019-11-14 16:22:28 +00:00
4a8c73bf4a CORDA-2744 - Prevent ClassCastException if error during initial registration (#5712)
* Prevent class cast exception if error during initial registration

* Appeasing detekt
2019-11-14 16:13:08 +00:00
6104d114c8 NOTICK: Update API after release of 4.3
Update the api-current.txt file after the release of Corda 4.3
2019-11-14 15:11:02 +00:00
84983ffb16 CORDA-3422 - Remove design docs from 4.4 2019-11-14 14:54:38 +00:00
384dfca04e Merge branch 'release/os/4.3' into 'release/os/4.4' 2019-11-14 14:53:32 +00:00
67bc985aeb CORDA-3422 - Remove design docs from 4.1 (#5715) 2019-11-14 14:43:30 +00:00
7d5c59e9cc Merge OS 4.3 to OS 4.4 (#5713)
Merge OS 4.3 to OS 4.4 (#5713)
2019-11-14 13:07:09 +00:00
cc7d15bf52 CORDA-3414: Upgrade to Corda Gradle plugins 5.0.6. (#5711) 2019-11-14 12:11:30 +00:00
612fd83893 Fixed node driver issue 2019-11-14 11:25:56 +00:00
c31cddaffc Fixed merge conflicts 2019-11-14 10:40:12 +00:00
a3bc4ff93a Merge pull request #5709 from corda/FEAT-43-r4.4
MERGE: 4.1 -> 4.3
2019-11-14 09:24:16 +00:00
987415dd83 CORDA-3407: Install external byte-code cache for sandboxed CorDapps. (#5699) 2019-11-14 09:09:57 +00:00
637c8524fc Merge branch 'release/os/4.1' into FEAT-43-r4.4 2019-11-13 19:16:09 +00:00
8e4666961a CORDA-3422 - Remove design docs from 4.0 (#5707) 2019-11-13 18:01:04 +00:00
11b94a5e50 Merge pull request #5703 from corda/EdP/CORDA-3181-merge-to-4.3
Merge OS 4.1 -> OS 4.3
2019-11-13 14:43:57 +00:00
14373ab5ab Merge remote-tracking branch 'origin/release/os/4.1' into EdP/CORDA-3181-merge-to-4.3
# Conflicts:
#	constants.properties
#	docs/source/getting-set-up.rst
2019-11-13 13:13:16 +00:00
7f3260e1b3 TM-89 fixing double archiving and misleading log (#5698) 2019-11-13 11:33:12 +00:00
71af7ad7cb Print remaining k8s pods on pod completion (#5697)
* TM-87 printing remaining pods on pod completion

* TM-87 extra commit to unblock jenkins?

* TM-87 extra commit to unblock jenkins?

* TM-87 pr comments
2019-11-13 11:32:54 +00:00
bec865dc57 CORDA-3358: Add capsule-friendly argument to docs (#5627)
CORDA-3358: Add capsule-friendly argument to docs (#5627)
2019-11-13 10:36:07 +00:00
ed1216f622 Merge pull request #5532 from corda/CORDA-3181-4.1-EdP
CORDA-3181 Correct JDK install instructions + streamlining
2019-11-13 09:41:54 +00:00