From 19e3fb1f0a6eccde718d7e164f9cb1472cb19d00 Mon Sep 17 00:00:00 2001
From: apostolof <apotwohd@gmail.com>
Date: Sun, 28 Feb 2021 15:43:01 +0200
Subject: [PATCH] fix: use sh instead of docker plugin

---
 jenkins/Jenkinsfile | 64 ++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index 7d3ba88..159c1a1 100755
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -19,9 +19,7 @@ def sharedPackageVersion
 
 // Docker images
 def appImage
-def appTestsImage
 def contractsImage
-def contractsTestsImage
 def contractsProviderImage
 def pinnerImage
 
@@ -113,44 +111,46 @@ pipeline {
         stage('TEST CONTRACTS') {
           steps {
             script {
-              try {
-                def ganacheTestPort = sh(script: "bash ./jenkins/hash_build_properties.sh ${BRANCH_NAME} ${BUILD_NUMBER} | xargs bash ./jenkins/map_to_thousand.sh", returnStdout: true).trim()
+              def ganacheTestPort = sh(script: "bash ./jenkins/hash_build_properties.sh ${BRANCH_NAME} ${BUILD_NUMBER} | xargs bash ./jenkins/map_to_thousand.sh", returnStdout: true).trim()
+
+              def ganacheTestImage = docker.build(
+                "ecentrics/concordia-ganache",
+                "-f docker/ganache/Dockerfile \
+                ./"
+              )
 
-                def ganacheTestImage = docker.build(
-                  "ecentrics/concordia-ganache",
-                  "-f docker/ganache/Dockerfile \
-                  ./"
-                )
+              docker.build(
+                "ecentrics/concordia-contracts-tests:${sanitizedBranchName}-v${contractsPackageVersion}-b${BUILD_NUMBER}-tests",
+                "-f docker/concordia-contracts/Dockerfile \
+                ./ \
+                --target test \
+                --build-arg TZ=Europe/Athens"
+              )
 
-                sh 'docker network create --driver bridge concordia_ganache_test_network || true'
+              sh 'docker network create --driver bridge concordia_ganache_test_network || true'
 
-                ganacheTestImage.withRun("""-d -p 6${ganacheTestPort}:8546 \
+              ganacheTestImage.withRun("""-d -p 6${ganacheTestPort}:8546 \
                 --env-file=./jenkins/env/ganache.test.jenkins.env \
                 --name concordia-ganache-test-6${ganacheTestPort} \
                 --net=concordia_ganache_test_network""") { concordiaGanacheTest ->
 
-                  contractsTestsImage = docker.build(
-                    "ecentrics/concordia-contracts-tests:${sanitizedBranchName}-v${contractsPackageVersion}-b${BUILD_NUMBER}-tests",
-                    "-f docker/concordia-contracts/Dockerfile \
-                    ./ \
-                    --target test \
-                    --build-arg TZ=Europe/Athens"
-                  )
-
-                  contractsTestsImage.run("""--rm \
-                  -v ecentrics_janus_common:/mnt/concordia/test-reports/ \
-                  --env-file=./jenkins/env/contracts.test.jenkins.env \
-                  -e WEB3_HOST=concordia-ganache-test-6${ganacheTestPort} \
-                  -e WEB3_PORT=6${ganacheTestPort} \
-                  --net=concordia_ganache_test_network""")
+                try {
+                   sh """docker run \
+                     --rm \
+                     -v ecentrics_janus_common:/mnt/concordia/test-reports/ \
+                     --env-file=./jenkins/env/contracts.test.jenkins.env \
+                     -e WEB3_HOST=concordia-ganache-test-6${ganacheTestPort} \
+                     -e WEB3_PORT=6${ganacheTestPort} \
+                     --net=concordia_ganache_test_network \
+                     ecentrics/concordia-contracts-tests:${sanitizedBranchName}-v${contractsPackageVersion}-b${BUILD_NUMBER}-tests"""
+                } catch (e) {
+                  error('Some tests failed!')
+                  error('Aborting the build.')
+                  throw e
+                } finally {
+                  sh 'mkdir -p ./reports/${BUILD_NUMBER}/contracts'
+                  sh 'find /mnt/janus/common/ -name "concordia-contracts-*" -exec cp \'{}\' ./reports/${BUILD_NUMBER}/contracts/ \\;'
                 }
-              } catch (e) {
-                error('Some tests failed!')
-                error('Aborting the build.')
-                throw e
-              } finally {
-                sh 'mkdir -p ./reports/${BUILD_NUMBER}/contracts'
-                sh 'find /mnt/janus/common/ -name "concordia-contracts-*" -exec cp \'{}\' ./reports/${BUILD_NUMBER}/contracts/ \\;'
               }
             }
           }