X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=df48a4cd1ff6690ea24a8210f500c7ba5f0381f1;hb=1c371f0ee90a739fc934fd052dbfe9e65a97fdaa;hp=781e3763d8e48c18ce668ffd518a2bf82161c982;hpb=1440bac27ba862b1a79223d9505a26b6c425b574;p=ci-management.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 781e3763d..df48a4cd1 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -41,7 +41,12 @@
 - builder:
     name: integration-run-test
     builders:
-      - shell: "${WORKSPACE}/test/csit/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}"
+      - 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
@@ -53,12 +58,61 @@
     builders:
       - shell: "${WORKSPACE}/autorelease/scripts/set-version.sh"
 
+- builder:
+    name: integration-install-vagrant
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -ex # Fail build if any setup step fails
+          sudo add-apt-repository --yes ppa:tiagohillebrandt/vagrant
+          sudo apt update
+          sudo apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant
+          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-docker-compose-logs
+    builders:
+      - shell: !include-raw: shell/docker-compose-logs.sh
+
 - publisher:
     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}'
+          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}'
           only-critical: false
+
+- publisher:
+    name: integration-docker-compose-logs
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - FAILURE
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - integration-docker-compose-logs