Merge "Chore: Move to ubuntu2004-docker"

[ci-management.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 89e83c2..df48a4c 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -31,14 +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'
-
 - builder:
     name: integration-install-robotframework
     builders:
@@ -51,6 +43,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:
@@ -76,18 +73,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-docker-compose-logs
     builders:
@@ -98,6 +83,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}'