CSIT: Make tox job gating (as VPP checkstyle)

+ Add code comments explaining how CSIT device tests can be started.

Change-Id: Icc5bd800f8fdc4616366a32559304977fba9fb04
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

3 files changed, 40 insertions, 15 deletions

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 4ef4bfeb8..3999144e8 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -70,9 +70,37 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit-trigger-patch-submitted:
-          name: '{project}'
-          branch: '{branch}'
+      # Tox trigger is special.
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'true'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            # Not enabling on draft published event.
+            # Frequently, people publish for public access, not fr verify.
+            # Use recheck comment to trigger verify.
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          override-votes: true
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          failed-message: 'Tox failed. No further verify jobs will be started.'
+          successful-message: 'tox_success'
+          skip-vote:
+            successful: true
+            failed: false
+            unstable: false
+            notbuilt: false
 
     builders:
       - shell:
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 252684125..9a4b47da2 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -150,7 +150,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - 'gerrit-trigger-csit-vpp-devicetest-full':
+      - gerrit-trigger-csit-vpp-devicetest-full:
           project: '{project}'
           branch: '{branch}'
           skip-vote: '{skip-vote}'
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 89bdda3b6..03b99f5ec 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -362,23 +362,20 @@
 
 - trigger:
     name: gerrit-trigger-csit-vpp-devicetest-full
-    # Comes from CSIT, for automatic jobs running "device" tests with VPP builds.
+    # Comes from CSIT, for automatic jobs running device tests with VPP builds.
     # The job acts as an automatic verify job for CSIT contributions.
     triggers:
       - gerrit:
           server-name: 'Primary'
           trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'true'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
+            # The main way the job is triggered automatically on patch upload.
+            # Gated by tox job, so we do not spend resources on WiP changes.
             - comment-added-contains-event:
-                comment-contains-value: 'reverify'
+                comment-contains-value: 'tox_success'
+            # Manual trigger to allow testing WiP changes with selected tags.
             - comment-added-contains-event:
                 comment-contains-value: 'csit-devicetest'
+            # A comment with "recheck" restarts tox job, so no condition here.
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'