commit cd1a70504f20a483c6732b711302d50d73ad5656
author Filip Pytloun <fpytloun@mirantis.com> Thu May 18 09:08:41 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Thu May 18 09:08:42 2017 +0000
tree bf53424495cd03333cfe456687ed061439ae4733
parent 02d9c206623e760bc6c31a9eb033a7c9aaf6e7a6
parent feb959efe1a4c2ebfcf98a8d058ade7e6941b564

Merge "add contrail installation"

test-nodejs-pipeline.groovy

diff --git a/test-nodejs-pipeline.groovy b/test-nodejs-pipeline.groovy
index 9e033fd..d659b7e 100644
--- a/test-nodejs-pipeline.groovy
+++ b/test-nodejs-pipeline.groovy
@@ -58,15 +58,9 @@
              }
         }
         stage('Generate config file for devops portal') {
-            def builder = new groovy.json.JsonBuilder()
-            def config = builder.services {
-                elasticsearch {
-                    endpoint 'http://elasticsearch:9200'
-                }
-            }
             writeFile (
                 file: "${workspace}/test_config.json",
-                text: config.toString()
+                text: '${JSON_CONFIG}'
             )
        }
        stage('Start container') {
@@ -95,7 +89,7 @@
         common.sendNotification(currentBuild.result, "" ,["slack"])
         stage('Cleanup') {
             if (containerId != null) {
-                dockerCleanupCommands = ['stop', 'rm']
+                dockerCleanupCommands = ['stop', 'rm -f']
                 for (int i = 0; i < dockerCleanupCommands.size(); i++) {
                     sh("docker-compose -f ${COMPOSE_PATH} -p ${uniqId} ${dockerCleanupCommands[i]} || true")
                 }