Merge "Remove old PNF simulator JJB"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 781e376..9964750 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -41,7 +41,7 @@
 - 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-autorelease-fix-relativepaths
@@ -53,6 +53,24 @@
     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
+          mkdir -p ~/.ssh
+
+- builder:
+    name: integration-docker-compose-logs
+    builders:
+      - shell: !include-raw: shell/docker-compose-logs.sh
+
 - publisher:
     name: integration-robot
     publishers:
@@ -62,3 +80,16 @@
           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