Merge "Update sandbox bash functions"

[ci-management.git] / jjb / csit / csit-tox.yaml

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 3f405e4..f5f7b2b 100644 (file)
--- 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:
@@ -16,28 +16,33 @@
     name: csit-validate
 
     jobs:
-      - 'csit-verify-tox-{stream}'
+      - 'csit-verify-tox-{stream}-{os}-{executor-arch}'
 
     project: 'csit'
     branch: 'master'
+    os: 'ubuntu2004'
+    executor-arch: 'x86_64'
     stream:
       - master:
           branch: 'master'
-      - '1908_1':
-          branch: 'rls1908_1'
-      - '2001':
-          branch: 'rls2001'
+      - '2005':
+          branch: 'rls2005'
+      - '2009':
+          branch: 'rls2009'
+      - '2009_lts':
+          branch: 'rls2009_lts'
+      - '2101':
+          branch: 'rls2101'
 
 - job-template:
-    name: 'csit-verify-tox-{stream}'
+    name: 'csit-verify-tox-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1804-us
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: '*.log'
     latest-only: false
 
-
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
       numToKeep: '{build-num-to-keep}'
@@ -66,11 +71,42 @@
           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:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/tox.sh