Rename collect_logs() -> collect_netvirt_logs()

Since we moved collect_logs() from the openstack deploy
script to the common_functions lib, it loses the context
that it's openstack/netvirt related log collections.
Changing it's name will make it more clear for others
that may see it and find it useful (or not).

Change-Id: I3eca09cdf512960481fc576207b486dfd27615b6
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 23edc1224e853feed3d54f491f55854de66733b9..051377f03d4412f4b518f820c79df9119fd3a6e4 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -225,7 +225,7 @@ EOF
     fi # if [ "${OPENSTACK_BRANCH}" = "stable/queens" ]; then
 }
 
-function collect_logs() {
+function collect_netvirt_logs() {
     set +e  # We do not want to create red dot just because something went wrong while fetching logs.
 
     cat > extra_debug.sh << EOF
@@ -408,4 +408,4 @@ EOF
     else
         echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
     fi
-} # collect_logs()
+} # collect_netvirt_logs()

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 776d7d5396cce89da95e364cd2af9ee050f3da88..36479f2fdeaf6ebc63048ed3ec9db8e6838d074d 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -587,7 +587,7 @@
           mark-unstable-if-failed: true
 
 - publisher:
-    name: integration-csit-collect-logs
+    name: integration-csit-collect-netvirt-logs
     publishers:
       - postbuildscript:
           builders:
@@ -604,5 +604,5 @@
                 - shell: |
                     #!/bin/bash
                     source /tmp/common-functions.sh ${BUNDLEFOLDER}
-                    collect_logs
+                    collect_netvirt_logs
           mark-unstable-if-failed: true

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 9e484b185030f1ee90dd4f25b362767c8bea6ccf..633782d2784784d6d477b02b82069fa07379b3c7 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1010,7 +1010,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - integration-csit-collect-logs
+      - integration-csit-collect-netvirt-logs
       - integration-csit-archive-build
       - integration-csit-run-postscript
       - releng-openstack-stack-delete
@@ -1221,7 +1221,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - integration-csit-collect-logs
+      - integration-csit-collect-netvirt-logs
       - integration-csit-archive-build
       - integration-csit-run-postscript
       - releng-openstack-stack-delete