Merged branch master into feature/cli-payment-tests

Author: Artemkaaas

Jenkinsfile.cd

@@ -147,7 +147,7 @@ def closePool(env_name, network_name, poolInst) {
 
 void getSrcVersion(folder) {
     commit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
-    version = sh(returnStdout: true, script: "wget -q https://raw.githubusercontent.com/hyperledger/indy-sdk/$commit/$folder/Cargo.toml -O - | grep -E '^version =' | head -n1 | cut -f2 -d= | cut -f2 -d '\"'").trim()
+    def version = sh(returnStdout: true, script: "wget -q https://raw.githubusercontent.com/hyperledger/indy-sdk/$commit/$folder/Cargo.toml -O - | grep -E '^version =' | head -n1 | cut -f2 -d= | cut -f2 -d '\"'").trim()
     return version
 }
 
@@ -234,7 +234,7 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
         dir('libnullpay') {
             testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
                 echo "${env_name} Indy Libnullpay Test: Build"
-                sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo build"
+                sh "LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo build --release"
 
                 if (stashBuildResults) {
                     stash includes: 'target/release/libnullpay.so', name: 'LibnullpayUbuntuBuildResult'
@@ -371,13 +371,15 @@ def rhelTesting() {
 }
 
 def rhelPublishing() {
+    def libindyVersion;
+
     node('ubuntu') {
         stage('Publish Libindy RPM Files') {
             try {
                 echo 'Publish Rpm files: Checkout csm'
                 checkout scm
 
-                version = getSrcVersion("libindy")
+                libindyVersion = getSrcVersion("libindy")
 
                 dir('libindy') {
                     echo 'Publish Rpm: Build docker image'
@@ -399,25 +401,27 @@ def rhelPublishing() {
             }
         }
     }
-    return version
+    return libindyVersion
 }
 
 def ubuntuPublishing() {
+    def libindyVersion
+
     node('ubuntu') {
         stage('Publish Ubuntu Files') {
             try {
                 echo 'Publish Ubuntu files: Checkout csm'
                 checkout scm
 
-                version = getSrcVersion("libindy")
+                libindyVersion = getSrcVersion("libindy")
 
                 echo 'Publish Ubuntu files: Build docker image'
                 testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
 
-                libindyDebPublishing(testEnv, version)
+                libindyDebPublishing(testEnv, libindyVersion)
                 pythonWrapperPublishing(testEnv, false)
                 javaWrapperPublishing(testEnv, false)
-                libindyCliDebPublishing(testEnv, version)
+                libindyCliDebPublishing(testEnv, libindyVersion)
                 libnullpayDebPublishing(testEnv)
             }
             finally {
@@ -426,32 +430,34 @@ def ubuntuPublishing() {
             }
         }
     }
-
-    return version
+    return libindyVersion
 }
 
 def windowsPublishing() {
+    def libindyVersion
     node('win2016') {
         stage('Publish Libindy Windows Files') {
             try {
                 echo 'Publish Windows files: Checkout csm'
                 checkout scm
 
-                version = getSrcVersion("libindy")
+                libindyVersion = getSrcVersion("libindy")
 
                 dir('libindy') {
                     echo 'Publish Libindy Windows files'
-                    windowsPublishArtifact("libindy", "lib", "LibindyWindowsBuildResult")
+                    windowsPublishArtifact("libindy", "lib", libindyVersion, "LibindyWindowsBuildResult")
                 }
 
                 dir('cli') {
                     echo 'Publish Indy Cli Windows files'
-                    windowsPublishArtifact("indy-cli", "executable", "IndyCliWindowsBuildResult")
+                    windowsPublishArtifact("indy-cli", "executable", libindyVersion, "IndyCliWindowsBuildResult")
                 }
 
                 dir('libnullpay') {
+                    def libnullpayVersion = getSrcVersion("libnullpay")
+
                     echo 'Publish Libnullpay Cli Windows files'
-                    windowsPublishArtifact("libnullpay", "lib", "LibnullpayWindowsBuildResult")
+                    windowsPublishArtifact("libnullpay", "lib", libnullpayVersion, "LibnullpayWindowsBuildResult")
                 }
             }
             finally {
@@ -460,14 +466,14 @@ def windowsPublishing() {
             }
         }
     }
-    return version
+    return libindyVersion
 }
 
-def windowsPublishArtifact(packageName, packageType, stashName) {
+def windowsPublishArtifact(packageName, packageType, packageVersion, stashName) {
     unstash name: stashName
 
     withCredentials([file(credentialsId: 'SovrinRepoSSHKey', variable: 'repo_key')]) {
-        sh "../ci/win-zip-and-upload.sh $packageName $packageType $version '${repo_key}' ${env.BRANCH_NAME} $env.BUILD_NUMBER"
+        sh "../ci/win-zip-and-upload.sh $packageName $packageType $packageVersion '${repo_key}' ${env.BRANCH_NAME} $env.BUILD_NUMBER"
     }
 }
 
@@ -502,9 +508,9 @@ def libindyCliDebPublishing(testEnv, version) {
 def libnullpayDebPublishing(testEnv) {
     echo 'Publish Libnullpay deb files to Apt'
 
-    def version = getSrcVersion("libnullpay")
+    def libnullpayVersion = getSrcVersion("libnullpay")
 
-    debPublishing(testEnv, "libnullpay", "libnullpay", version, "LibnullpayUbuntuBuildResult", "libnullpayDebs")
+    debPublishing(testEnv, "libnullpay", "libnullpay", libnullpayVersion, "LibnullpayUbuntuBuildResult", "libnullpayDebs")
 }
 
 def debPublishing(testEnv, directory, packageName, version, inStashName, outStashName) {
@@ -579,16 +585,16 @@ def publishingRCtoStable() {
                     downloadPackagingUtils()
                 }
 
-                version = getSrcVersion("libindy")
+                def libindyVersion = getSrcVersion("libindy")
 
                 echo 'Moving Windows RC artifacts to Stable: libindy'
-                publishLibindyWindowsFilesRCtoStable(version)
+                publishLibindyWindowsFilesRCtoStable(libindyVersion)
 
                 echo 'Moving RC artifacts to Stable: Build docker image for wrappers publishing'
                 testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
 
                 echo 'Moving Ubuntu RC artifacts to Stable: libindy'
-                publishLibindyDebRCtoStable(testEnv, version)
+                publishLibindyDebRCtoStable(testEnv, libindyVersion)
 
                 echo 'Moving Ubuntu RC artifacts to Stable: python wrapper'
                 pythonWrapperPublishing(testEnv, true)
@@ -597,13 +603,13 @@ def publishingRCtoStable() {
                 javaWrapperPublishing(testEnv, true)
 
                 echo 'Moving Ubuntu RC artifacts to Stable: indy-cli'
-                publishLibindyCliDebRCtoStable(testEnv, version)
+                publishLibindyCliDebRCtoStable(testEnv, libindyVersion)
 
                 echo 'Moving Windows RC artifacts to Stable: indy-cli'
-                publishLibindyCliWindowsFilesRCtoStable(version)
+                publishLibindyCliWindowsFilesRCtoStable(libindyVersion)
 
                 echo 'Moving Windows RC artifacts to Stable: libnullpay'
-                publishLibnullpayWindowsFilesRCtoStable(version)
+                publishLibnullpayWindowsFilesRCtoStable(libindyVersion)
 
                 echo 'Moving Ubuntu RC artifacts to Stable: libnullpay'
                 publishLibnullpayDebRCtoStable(testEnv)
@@ -625,8 +631,8 @@ def publishLibindyCliWindowsFilesRCtoStable(version) {
 }
 
 def publishLibnullpayWindowsFilesRCtoStable() {
-    version = getSrcVersion("libnullpay")
-    publishWindowsFilesRCtoStable("libnullpay", version)
+    def libnullpayVersion = getSrcVersion("libnullpay")
+    publishWindowsFilesRCtoStable("libnullpay", libnullpayVersion)
 }
 
 def publishWindowsFilesRCtoStable(packageName, version) {
@@ -649,8 +655,8 @@ def publishLibindyCliDebRCtoStable(testEnv, version) {
 }
 
 def publishLibnullpayDebRCtoStable(testEnv) {
-    version = getSrcVersion("libnullpay")
-    publishDebRCtoStable(testEnv, "libnullpay", "libnullpay", version, "libindyCliDebs", false)
+    def libnullpayVersion = getSrcVersion("libnullpay")
+    publishDebRCtoStable(testEnv, "libnullpay", "libnullpay", libnullpayVersion, "libindyCliDebs", false)
 }
 
 def publishDebRCtoStable(testEnv, packageName, folder, version, stashName, moveDevArtifacts) {