X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=a101a71b421f536b5277d85bad62327f862d7635;hb=efce69317c6b74c8f3f5c869efed5bc4f533dd7c;hp=918d67c3f6d66cfd192d8daf1e2cab88909e522f;hpb=9daa42d27056930451c24ffa519eb8ad31602e7d;p=ci-management.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 918d67c3f..a101a71b4 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -4,73 +4,57 @@
     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'
-
-- parameter:
-    name: integration-terraform-version
-    parameters:
-      - string:
-          name: TERRAFORM_VERSION
-          default: '{terraform-version}'
-          description: 'Terraform version to install on minion'
-
-- parameter:
-    name: integration-terragrunt-version
-    parameters:
-      - string:
-          name: TERRAGRUNT_VERSION
-          default: '{terragrunt-version}'
-          description: 'Terragrunt version to install on minion'
-
-- parameter:
-    name: integration-unique-docker-tag
-    parameters:
-     - string:
-          name: UNIQUE_DOCKER_TAG
-          default: '{unique-docker-tag}'
-          description: 'Unique docker tag to identify specific version'
+          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-escape:
+          - 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
     builders:
-      - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}"
+      - shell: "$WORKSPACE/csit/run-project-csit.sh $TESTOPTIONS"
 
 - builder:
     name: integration-autorelease-fix-relativepaths
@@ -97,30 +81,6 @@
           vagrant plugin install vagrant-reload
           mkdir -p ~/.ssh
 
-- builder:
-   name: integration-install-terraform
-   builders:
-     - shell: |
-         #!/bin/bash
-         set -ex
-         cd /tmp
-         wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
-         unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip
-         sudo mv terraform /usr/local/bin/
-         terraform version
-
-- builder:
-   name: integration-install-terragrunt
-   builders:
-     - shell: |
-         #!/bin/bash
-         set -ex
-         cd /tmp
-         wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64
-         sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt
-         sudo chmod +x /usr/local/bin/terragrunt
-         terragrunt --version
-
 - builder:
     name: integration-docker-compose-logs
     builders:
@@ -130,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: