Adding teardown for Jenkins pipeline.

Author: anu3990

Jenkinsfile

@@ -14,6 +14,7 @@ def runTests(String type,String version){
         ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml -g \'logging|archivePath\' --invert  || true
         ./node_modules/.bin/gulp setupProxyTests || true
         ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert  || true
+        node etc/test-teardown.js -u admin:admin
     '''
 
 }
@@ -54,6 +55,7 @@ def runE2ETests(String type,String version){
         ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-multipleWorker.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-multipleWorker-results.xml || true
         ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true
         ../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true
+        node etc/test-teardown-qa.js
     '''
      junit '**/*.xml'
 

etc/test-setup-users.js

@@ -357,7 +357,6 @@ function setupUsers(manager, done) {
 
     response.data['user-default-list']['list-items']['list-item'].
     forEach(function(user) {
-      console.log(user)
       userName = user.nameref;
       if (!valcheck.isUndefined(requiredUsers[userName])) {
         requiredUsers[userName] = undefined;
@@ -366,7 +365,6 @@ function setupUsers(manager, done) {
 
     var missingUsers = Object.keys(requiredUsers).map(function(key) {
       var user = requiredUsers[key];
-      console.log(user)
       if (!valcheck.isUndefined(user)) {
         return user;
       }

etc/test-setup.js

@@ -559,7 +559,7 @@ function setup(manager) {
       });
     } else {
       console.log(testconfig.testServerName+' test server is available on port '+
-          JSON.parse(response.data).port);
+          response.data.port);
     }
   });
 }