Merge "Editing devstack daily job template"

diff --git a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh b/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
index ead72f1434b2c6e838bc243f9e63a3a92b8abb89..6b2b445113623ca66787c33145992e3d2be1567e 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
+++ b/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
@@ -15,7 +15,8 @@ pybot -e exclude \
 -v ODL_VERSION:$ODL_VERSION \
 -v TEMPEST_REGEX:$TEMPEST_REGEX ${SUITES} || true
 
-scp -r $ODL_SYSTEM_IP:/opt/stack/logs/ $WORKSPACE/
+scp $ODL_SYSTEM_IP:/opt/stack/logs/devstacklog.txt $WORKSPACE/
+scp -r $ODL_SYSTEM_IP:/opt/stack/logs/*karaf* $WORKSPACE/
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
 

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f5a3c4898a092a4dad737a950b81cf9c4e199f67..38b39a849acbbf5d3f033abb01047304caf6c515 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -651,8 +651,6 @@
             name: TEMPEST_REGEX
             default: 'tempest.api.network'
             description: 'Default grouping of tempest tests to run'
-        - integration-test-plan:
-            test-plan: '{project}-{functionality}.txt'
 
     scm:
         - integration-gerrit-scm:
@@ -692,6 +690,6 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*log*'
+            artifacts: 'devstacklog.txt,*karaf*'
         - email-notification:
             email-prefix: '[project]'