Merge branch 'master' into indy-1.14.2

brentzundel · Jan 30, 2020 · 9d22b63 · 9d22b63
2 parents 505b9a2 + 8da6493
commit 9d22b63
Show file tree

Hide file tree

Showing 118 changed files with 1,577 additions and 1,206 deletions.
diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
@@ -356,8 +356,15 @@ def linuxLibindyBuild(file, env_name, network_name, full_testing) {
 
         libindyBuildFinished[env_name] = true
 
-        echo "${env_name} Libindy Test: Test"
         testEnv.inside("--network=${network_name}") {
+            echo "${env_name} Libindy Test: Test Libindy submodules"
+
+            for (component in ["libindy/indy-api-types", "libindy/indy-utils", "libindy/indy-wallet"]) {
+                testLibindyComponent(component)
+            }
+
+            echo "${env_name} Libindy Test: Test"
+
             def features_args = full_testing ? "--features sodium_static" : "--features \"sodium_static only_high_cases\""
 
             sh """
@@ -382,6 +389,14 @@ def linuxLibindyBuild(file, env_name, network_name, full_testing) {
     }
 }
 
+def testLibindyComponent(directory) {
+    sh """
+        cd ${directory}
+        RUST_BACKTRACE=1 cargo test --release --no-run
+        RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --release
+    """
+}
+
 def linuxVcxBuild(file, env_name, network_name) {
     def poolInst
     try {

diff --git a/Jenkinsfile.ci b/Jenkinsfile.ci
@@ -480,8 +480,15 @@ def linuxLibindyBuild(file, env_name, network_name, full_testing) {
 
         libindyBuildFinished[env_name] = true
 
-        echo "${env_name} Libindy Test: Test"
         testEnv.inside("--network=${network_name}") {
+            echo "${env_name} Libindy Test: Test Libindy submodules"
+
+            for (component in ["libindy/indy-api-types", "libindy/indy-utils", "libindy/indy-wallet"]) {
+                testLibindyComponent(component)
+            }
+
+            echo "${env_name} Libindy Test: Test"
+
             def features_args = full_testing ? "--features sodium_static" : "--features \"sodium_static only_high_cases\""
 
             sh """
@@ -506,6 +513,14 @@ def linuxLibindyBuild(file, env_name, network_name, full_testing) {
     }
 }
 
+def testLibindyComponent(directory) {
+    sh """
+        cd ${directory}
+        RUST_BACKTRACE=1 cargo test --no-run
+        RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test
+    """
+}
+
 def linuxVcxBuild(file, env_name, network_name) {
     def poolInst
     try {