From 919095c103bfa93b61fec6519a3b9decbd87160b Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 14 Nov 2018 10:21:01 +0800 Subject: [PATCH] Consolidate CSIT publisher into macro Create a single macro that manages the common configuration used by all CSIT job templates. Also consolidates the duplicate 'robot' publisher into this new macro to simplify the macros file. Change-Id: Ie87be771ad130fdfefd6a893d86f98a12d92bcd6 Signed-off-by: Thanh Ha --- jjb/integration/integration-macros.yaml | 26 ++----- jjb/integration/integration-templates.yaml | 85 +++++++++------------- 2 files changed, 42 insertions(+), 69 deletions(-) diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index f798130e4..8b591a6c9 100644 --- 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 diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 694bd47d2..f2324ea18 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -139,15 +139,13 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 - lf-infra-publish @@ -243,9 +241,6 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' @@ -390,9 +385,10 @@ inclusion-flag: '{10-inclusion-flag}' exclude: '{10-exclude-value}' format: csv - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 - lf-infra-publish - job-template: @@ -541,15 +537,13 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 - lf-infra-publish @@ -646,9 +640,6 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' @@ -793,9 +784,10 @@ inclusion-flag: '{10-inclusion-flag}' exclude: '{10-exclude-value}' format: csv - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 - lf-infra-publish - job-template: @@ -937,9 +929,6 @@ - integration-cleanup-tmp publishers: - - integration-robot: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' @@ -972,9 +961,10 @@ inclusion-flag: 'off' display-table: true format: csv - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: '' + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 - lf-infra-publish @@ -1186,16 +1176,14 @@ - integration-cleanup-tmp publishers: - - integration-robot-tempest: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - integration-csit-collect-netvirt-logs - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: + - tempest_results.html + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 - lf-infra-publish - job-template: @@ -1580,16 +1568,14 @@ - integration-cleanup-tmp publishers: - - integration-robot-tempest: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - integration-csit-collect-netvirt-logs - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: + - tempest_results.html + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 - lf-infra-publish - job-template: @@ -1990,15 +1976,14 @@ - integration-cleanup-tmp publishers: - - integration-robot-tempest: - unstable-if: 0.0 - pass-if: 100.0 - email-notification: email-recipients: '{email-recipients}' email-prefix: '[{project}]' - - integration-csit-archive-build - - integration-csit-run-postscript - - releng-openstack-stack-delete + - integration-csit-publish: + robot_other_files: + - tempest_results.html + robot-pass-threshold: 100.0 + robot-unstable-threshold: 0.0 - lf-infra-publish - job-template: -- 2.36.6