Use naginator retrigger in swarm jobs

Change-Id: Ia3d5046ad0c930b1443dae5eb040adcde82c2730

diff --git a/maintenance-ci/mos/jobs/9.x.swarm.runner.yaml b/maintenance-ci/mos/jobs/9.x.swarm.runner.yaml
index edcd905c80ee22e41d86890167af1530f8df0bb2..747c7439e1eca049bfe19adef81db7baa29a2005 100644 (file)
--- a/maintenance-ci/mos/jobs/9.x.swarm.runner.yaml
+++ b/maintenance-ci/mos/jobs/9.x.swarm.runner.yaml
@@ -24,6 +24,10 @@
         name: RUN_REPORTER_AFTER_JOB
         default: true
         description: "Report results?"
+    - bool: # same as above - we want to reschedule only swarm-based runs
+        name: RERUN_AFTER_FAILURE
+        default: true
+        description: "Reschedule job after failure?"
     - 9x-systest-params
     - mos-jenkins-swarm-params
 

diff --git a/maintenance-ci/mos/templates/swarm-test.yaml b/maintenance-ci/mos/templates/swarm-test.yaml
index c37541c6974a07d83fb37575f58bc62e159c1661..95193ea35a6bd21c6eb6e53f0fb4920a89836d2a 100644 (file)
--- a/maintenance-ci/mos/templates/swarm-test.yaml
+++ b/maintenance-ci/mos/templates/swarm-test.yaml
@@ -44,6 +44,10 @@
         name: RUN_REPORTER_AFTER_JOB
         default: false
         description: "Report results?"
+    - bool: # same as above - we want to reschedule only swarm-based runs
+        name: RERUN_AFTER_FAILURE
+        default: false
+        description: "Reschedule job after failure?"
     - 9x-systest-params
     - text:
         name: EXTRA_OPTS
@@ -97,6 +101,15 @@
 
     - post-destroy-vms
 
+    # retry if job failed
+    - conditional-publisher:
+      - condition-kind: boolean-expression
+        condition-expression: $RERUN_AFTER_FAILURE
+        action:
+        - naginator:
+            max-failed-builds: 2
+            fixed-delay: 600
+
     - description-setter:
         regexp: "'Description string: (.*)'"
         regexp-for-failed: "'Description string: (.*)'"

diff --git a/maintenance-ci/mos/templates/testrail-report-9.x.yaml b/maintenance-ci/mos/templates/testrail-report-9.x.yaml
index 1e5845e95d1868ba69b058115074f67a45242f60..1efb57c72e116288a635ecb999100fbaf8c84598 100644 (file)
--- a/maintenance-ci/mos/templates/testrail-report-9.x.yaml
+++ b/maintenance-ci/mos/templates/testrail-report-9.x.yaml
@@ -43,6 +43,11 @@
 
 
     publishers:
+    # retry if job failed
+    - naginator:
+        max-failed-builds: 10
+        progressive-delay-increment: 30
+        progressive-delay-maximum: 600
     - description-setter:
         regexp: '^.*Report URL:\s*(.*)'
         description: '<a href="\1">TestRail Report URL</a>'