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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 11680b6b0..918d67c3f 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -31,6 +31,30 @@
           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:
@@ -43,6 +67,11 @@
     builders:
       - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
 
+- builder:
+    name: integration-run-project-test
+    builders:
+      - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}"
+
 - builder:
     name: integration-autorelease-fix-relativepaths
     builders:
@@ -65,8 +94,33 @@
           vagrant plugin install vagrant-libvirt
           vagrant plugin install vagrant-disksize
           vagrant plugin install vagrant-sshfs
+          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:
@@ -77,6 +131,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}'