X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=5e9099908f5fbdfe56c32dcdfb29aa29fcb7c48b;hb=7f8773cdf1c59f76cb666247a0dfeb703ede86e7;hp=7d831c67359b8a796cefe4877565a7ed83670480;hpb=1e55439100338508226bc1ae68ae05b513953d07;p=ci-management.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 7d831c673..5e9099908 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -4,51 +4,52 @@
     parameters:
       - string:
           name: TESTPLAN
-          default: '{test-plan}'
-          description: 'General test plan we will run unless stream-specific one is found'
+          default: "{test-plan}"
+          description: "General test plan we will run unless stream-specific one is found"
 
 - parameter:
     name: integration-test-options
     parameters:
       - string:
           name: TESTOPTIONS
-          default: '{test-options}'
-          description: 'Robot command options'
+          default: "{test-options}"
+          description: "Robot command options"
 
 - parameter:
     name: html-publisher-dir
     parameters:
       - string:
           name: HTMLDIR
-          default: '{html-dir}'
-          description: 'Directory location to be used by HTML publisher plugin'
+          default: "{html-dir}"
+          description: "Directory location to be used by HTML publisher plugin"
 
 - parameter:
     name: html-publisher-files
     parameters:
       - string:
           name: HTMLFILES
-          default: '{html-files}'
-          description: 'File name to be used by HTML publisher plugin to produce the report'
+          default: "{html-files}"
+          description: "File name to be used by HTML publisher plugin to produce the report"
 
 - builder:
     name: integration-install-robotframework
     builders:
-      - shell:
-          !include-raw:
+      - shell: !include-raw:
           - include-raw-integration-install-robotframework.sh
 
 - builder:
     name: integration-install-robotframework-py3
     builders:
-      - shell:
-          !include-raw:
+      - shell: !include-raw:
           - include-raw-integration-install-robotframework-py3.sh
 
 - builder:
     name: integration-run-test
     builders:
-      - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
+      - shell: |
+          git clone https://gerrit.onap.org/r/ci-management /tmp/ci-management
+          cp /tmp/ci-management/jjb/integration/*csit.sh ${WORKSPACE}
+          ${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}
 
 - builder:
     name: integration-run-project-test
@@ -89,26 +90,26 @@
     name: integration-robot
     publishers:
       - robot:
-          output-path: 'archives'
-          output-xml: '**/output.xml'
-          report-html: '**/report.html'
-          log-html: '**/log.html'
-          other-files: ''
-          unstable-threshold: '{unstable-if}'
-          pass-threshold: '{pass-if}'
+          output-path: "archives"
+          output-xml: "**/output.xml"
+          report-html: "**/report.html"
+          log-html: "**/log.html"
+          other-files: ""
+          unstable-threshold: "{unstable-if}"
+          pass-threshold: "{pass-if}"
           only-critical: false
 
 - publisher:
     name: integration-project-robot
     publishers:
       - robot:
-          output-path: 'csit/archives'
-          output-xml: '**/output.xml'
-          report-html: '**/report.html'
-          log-html: '**/log.html'
-          other-files: ''
-          unstable-threshold: '{unstable-if}'
-          pass-threshold: '{pass-if}'
+          output-path: "csit/archives"
+          output-xml: "**/output.xml"
+          report-html: "**/report.html"
+          log-html: "**/log.html"
+          other-files: ""
+          unstable-threshold: "{unstable-if}"
+          pass-threshold: "{pass-if}"
           only-critical: false
 
 - publisher: