Commit Graph

8197 Commits

Author SHA1 Message Date
Ed Prosser
63b7f2093e Merge branch 'release/os/4.3' into EdP/typo-merge-4.4
# Conflicts:
#	buildSrc/build.gradle
2019-11-29 13:53:06 +00:00
Jonathan Locke
04eec1de46
DOCS: Typo fix in getting started (#5772)
DOCS: Typo fix in getting started (#5772)
2019-11-29 13:18:00 +00:00
CaisManai
6487844ed5 Fixing small typo
"Double-click the new contract file to open it" should read "Double-click the new flow file to open it" as we're now working on flows.
2019-11-29 10:55:32 +00:00
Chris Rankin
5ce1535ea5 CORDA-3469: Allow EvolutionSerializer to handle boxed types becoming primitive. (#5766) 2019-11-28 16:39:45 +00:00
Razvan Codreanu
d33dbb2ea9 TM-104 Switching the distributed testing plugin to the one released in artifactory (#5764)
* TM-104 switch to using the published plugin

* TM-104 switching to artifactory plugin

* TM-104 remove unused plugin

* TM-104 adding docker plugin

* TM-104 adding docker plugin take 2

* add dependencies-dev and set distributed build plugin to changing
2019-11-28 14:49:39 +00:00
Amol Pednekar
f7328f18f4 [Issue #5746] Update cities.txt (#5747) 2019-11-27 17:55:32 +00:00
Roman Plášil
200f39de97 fix: warning when @NoConstraintPropagation used needs to use the correct class loader (#5690) 2019-11-27 15:35:09 +00:00
Stefano Franz
d604820de9
put podlogs into folder with taskName to support parallel jenkins unit and integration test run (#5759) 2019-11-26 13:05:02 +00:00
Dan Newton
45d6d3ead4 CORDA-3356 Subflow ledger consistency tests + move statemachine tests to slow integration tests (#5722)
* CORDA-3356 Subflow ledger consistency tests + move statemachine tests to slow integration tests

Add tests for subflows that fail during transitions.

Split out `StatemachineErrorHandlingTest` into a series of smaller tests.

Move these tests into the `integration-test-slow` category so they are
not run against every PR.

* CORDA-3356 Fix detekt issue

* CORDA-3356 Tidy test names
2019-11-25 17:11:54 +00:00
Dimos Raptis
10e9340871 [ENT-4483] - Make shell welcome message generic (#5758) 2019-11-25 17:09:47 +00:00
Kyriakos Tharrouniatis
21a075b727 CORDA-3197 Fix flow has been waiting message (#5660)
* Added a timestamp property to Checkpoint getting a new Instant.now() value at every Checkpoint instantiation/ copy instantiation. FlowMonitor is now using this new property (Checkpoint#timestamp) and StateMachineState#isFlowResumed to determine which flows are actually suspended. It leaves out flows that are doing work in their FlowLogic#call method.

* Cleaner comment

* Broke FlowMonitor#logFlowsWaitingForParty into logFlowsWaitingForParty and waitingFlowsToDurations. This way waitingFlowsToDurations is modular and can be tested.

Made FlowMonitor constructor get StateMachineManager instead of the retrieveFlows lamda. This way FlowMonitor is more consistent as a service, and entire flow filtering process is now being done in FlowMonitor#waitingFlowsToDurations.

Removed "smm as? StateMachineManagerInternal" in AbstractNode#start as it made no sense.

Updated CheckpointDumper to mention the Checkpoint#timestamp when writing the checkpoint as json.

* Added tests for FlowMonitor service.

* Remove old comment

* 1. FLowMonitor#waitingFlowDurations now returns a Sequence to have an iteration less.
It used to be, one iteration from returning a Set from FLowMonitor#waitingFlowDurations plus one iteration from FlowMonitor#logFlowsWaitingForParty.

2. Code reformattings

* 1. Remove constructor keyword from FlowMonitor

2. Code reformattings

3. Update detekt baseline

* Resolve conflict in Detekt baseline
2019-11-25 16:49:35 +00:00
Stefano Franz
0f92c96d15
Merge pull request #5745 from corda/EdP/CORDA-3446-4.4
Merge OS 4.3 -> OS 4.4
2019-11-25 12:47:21 +00:00
stefano
40b1a188f1 Merge remote-tracking branch 'origin/release/os/4.3' into EdP/CORDA-3446-4.4
# Conflicts:
#	docs/source/changelog.rst
2019-11-25 09:41:50 +00:00
stefano
75b68a57e4 Merge remote-tracking branch 'origin/release/os/4.4' into EdP/CORDA-3446-4.4 2019-11-25 09:40:55 +00:00
Stefano Franz
16eb2fce78
Allow taints on kubernetes nodes to determine scheduling of tests (#5755)
* allow a test group to specify taints for the nodes

* specify "effect" of toleration
modify test groups to use taints
modify preallocation to use taints

* add extra command line flags for unit test run
2019-11-25 09:39:37 +00:00
Rodrigo Vieira
76e0054482 NOTICK - Fix typo "transcation" => "transaction" (#5749) 2019-11-22 17:52:17 +00:00
rui-r3
ab3c4ac7f8 CORDA-2491: Ability to specify Java package namespace from Cordform (#5075) (#5115)
Add entry point with generic extra configuration options. Move configuration verification code to avoid circular dependencies.
2019-11-21 13:10:04 +00:00
James Higgs
6dbde1172d [CORDA-3442] Update app upgrade notes for gradle version for PV5 (#5740)
* [CORDA-3442] Update app upgrade notes for gradle version for PV5

* [CORDA-3442] Adjust a link and add some backticks
2019-11-21 11:52:11 +00:00
James Higgs
001c2cbdc4 [CORDA-3373][CORDA-3374] Update Cordform docs to discuss setting Jolokia version, update version number (#5748)
* [CORDA-3374] Update Cordform docs to discuss setting Jolokia version

* [CORDA-3373] Update Jolokia version in command for node-administration
2019-11-20 16:39:28 +00:00
Ryan Fowler
b5beb6119c CORDA-3158: Update docs with info about CAPSULE_CACHE_DIR (#5735)
* CORDA-3158: Update docs with info about CAPSULE_CACHE_DIR for capsule cache home

* CORDA-3158: Update docs with info about CAPSULE_CACHE_DIR for capsule cache home
2019-11-20 14:39:29 +00:00
Ed Prosser
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
Jonathan Locke
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
Stefan Iliev
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
Stefano Franz
698909a1ac
disable preallocation on regression builds (#5743) 2019-11-19 17:38:38 +00:00
Katelyn Baker
c349ff719d
NOTICK - Add ENUM to the C++ serialiser (#5616) 2019-11-19 16:00:11 +00:00
Chris Rankin
ce8ce2ba7c CORDA-2876: Upgrade to deterministic-rt 1.0-RC01. (#5738) 2019-11-19 15:02:35 +00:00
Denis Rekalov
a791e38319 CORDA-3443: Do not log warning when appending duplicated network parameters (#5739) 2019-11-19 15:02:07 +00:00
Stefano Franz
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
Dimos Raptis
890aaad898 [ENT-4430] - Remove infinite retrying from first attempt to establish a connection (#5737) 2019-11-19 15:01:01 +00:00
Ed Prosser
304b809d6b Updates for finalizing transactions with one participant 2019-11-19 14:32:33 +00:00
Chris Rankin
7abc1533ea CORDA-2963: Migrate deterministic-rt.jar into DJVM repository. (#5733) 2019-11-19 11:46:34 +00:00
Stefano Franz
5f819c1917
Merge pull request #5723 from corda/my_merge_branch
Merge OS4.3 -> OS4.4
2019-11-18 19:26:07 +00:00
Stefano Franz
221576d94a
move - responding flow from suffix to prefix of test name (#5731) 2019-11-18 15:41:15 +00:00
stefano
4e7c8a6b1b revert api-current to 4.4 2019-11-18 14:04:06 +00:00
Chris Rankin
0864eae949 CORDA-2963: Add calendars.properties to deterministic-rt.jar. (#5730) 2019-11-18 13:54:51 +00:00
stefano
88b7950e9e Merge remote-tracking branch 'origin/release/os/4.4' into my_merge_branch 2019-11-18 13:47:07 +00:00
stefano
098177fad4 Merge remote-tracking branch 'origin/release/os/4.3' into my_merge_branch 2019-11-18 13:46:43 +00:00
Stefano Franz
831ca33ed5
try increase websocket timeout due to azure EOF exceptions (#5729) 2019-11-18 13:45:43 +00:00
Jonathan Locke
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
Jonathan Locke
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
Chris Rankin
c68f8161fc CORDA-2876: Upgrade DJVM to 1.0-RC03. 2019-11-16 16:51:24 +00:00
Stefano Franz
052adc9791
fix merge issue with sidecar image work (#5724) 2019-11-15 17:31:58 +00:00
stefano
b11fd02f6e Merge remote-tracking branch 'origin/release/os/4.3' into my_merge_branch 2019-11-15 15:44:45 +00:00
Chris Rankin
a201a8d52b CORDA-2876: Fix serialization-djvm module for Java 11. (#5720) 2019-11-15 15:37:47 +00:00
Stefano Franz
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
Razvan Codreanu
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
cairncross
b48a714aaa TM-10 - Parallelise DB integration tests (postgres) (#5704) 2019-11-15 14:46:53 +00:00
Jonathan Locke
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
Jonathan Locke
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
Katelyn Baker
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