From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 9 Mar 2018 12:59:37 +0000 (-0600)
Subject: ceph-ansible-prs: archive ceph logs on failure
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a92d1fe4bc7ce6e6df2d03c6f751cfd1a773035f;p=ceph-build.git

ceph-ansible-prs: archive ceph logs on failure

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-ansible-prs/build/teardown b/ceph-ansible-prs/build/teardown
index 595e2f9e1..09d3862ff 100644
--- a/ceph-ansible-prs/build/teardown
+++ b/ceph-ansible-prs/build/teardown
@@ -8,6 +8,8 @@ scenarios=$(find . -name Vagrantfile | xargs dirname)
 
 for scenario in $scenarios; do
     pushd $scenario
+    # collect all ceph logs from all test nodes
+    collect_ceph_logs all
     vagrant destroy -f
     popd
 done
diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index b1bc9e07d..12553795b 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -162,7 +162,15 @@
           script-only-if-succeeded: False
           script-only-if-failed: True
           builders:
-            - shell: !include-raw ../../build/teardown
+            - shell:
+                !include-raw-escape:
+                  - ../../../scripts/build_utils.sh
+                  - ../../build/teardown
+
+      - archive:
+          artifacts: 'logs/**'
+          allow-empty: true
+          latest-only: false
 
 - job-template:
     name: 'ceph-ansible-prs-{release}-{ansible_version}-{scenario}'
@@ -233,7 +241,15 @@
           script-only-if-succeeded: False
           script-only-if-failed: True
           builders:
-            - shell: !include-raw ../../build/teardown
+            - shell:
+                !include-raw-escape:
+                  - ../../../scripts/build_utils.sh
+                  - ../../build/teardown
+
+      - archive:
+          artifacts: 'logs/**'
+          allow-empty: true
+          latest-only: false
 
 - job-template:
     name: 'ceph-ansible-prs-{release}-{ansible_version}-{scenario}'
@@ -304,4 +320,12 @@
           script-only-if-succeeded: False
           script-only-if-failed: True
           builders:
-            - shell: !include-raw ../../build/teardown
+            - shell:
+                !include-raw-escape:
+                  - ../../../scripts/build_utils.sh
+                  - ../../build/teardown
+
+      - archive:
+          artifacts: 'logs/**'
+          allow-empty: true
+          latest-only: false