X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=920d5edae56a53459488c8d4cd903136ddf7de9b;hb=6343b32a1e48a92a61c92379773975fb2d4d74d1;hp=d485b8ed72e9f39e2ac4856156fe9cbc6c4fa097;hpb=541f015d545022837518420c2e90b5aa5d894217;p=ci-management.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index d485b8ed7..920d5edae 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -31,30 +31,6 @@
           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'
-
 - builder:
     name: integration-install-robotframework
     builders:
@@ -62,10 +38,31 @@
           !include-raw:
           - include-raw-integration-install-robotframework.sh
 
+- builder:
+    name: integration-install-robotframework-py3
+    builders:
+      - 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
+    builders:
+      - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}"
+
+
+- builder:
+      name: integration-run-project-k8s-test
+      builders:
+          - shell: "${WORKSPACE}/csit/run-k8s-csit.sh install ${TESTOPTIONS}"
 
 - builder:
     name: integration-autorelease-fix-relativepaths
@@ -92,30 +89,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:
@@ -126,6 +99,22 @@
     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}'
+          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}'