Consolidate CSIT publisher into macro

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index f798130e40c1aa10629eb9b832ba8629d07809b7..8b591a6c922a4e0c41924bf70cb3ecd11eedb25b 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -570,30 +570,18 @@
 # Publishers #
 ##############
 
-# Macro: integration-robot
-# Operation: this macro publishes robot results
-# Used by: {project}-csit-* job templates
-
-- publisher:
-    name: integration-robot
-    publishers:
-      - robot:
-          output-path: ''
-          other-files: ''
-          unstable-threshold: '{unstable-if}'
-          pass-threshold: '{pass-if}'
-          only-critical: false
-
 - publisher:
-    name: integration-robot-tempest
+    name: integration-csit-publish
     publishers:
       - robot:
           output-path: ''
-          other-files:
-            - tempest_results.html
-          unstable-threshold: '{unstable-if}'
-          pass-threshold: '{pass-if}'
+          other-files: '{obj:robot_other_files}'
+          unstable-threshold: '{robot-unstable-threshold}'
+          pass-threshold: '{robot-pass-threshold}'
           only-critical: false
+      - integration-csit-archive-build
+      - integration-csit-run-postscript
+      - releng-openstack-stack-delete
 
 - publisher:
     name: integration-csit-archive-build