CSIT: Add rls2310 jobs.

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

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index e83ce94..1646413 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) 2023 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,33 +16,29 @@
     name: csit-validate
 
     jobs:
-      - 'csit-verify-tox-{stream}'
+      - 'csit-verify-tox-{stream}-{os}-{executor-arch}'
 
     project: 'csit'
     branch: 'master'
+    os: 'ubuntu2204'
+    executor-arch: 'x86_64'
     stream:
       - master:
           branch: 'master'
-      - '1904':
-          branch: 'rls1904'
-      - '1908_1':
-          branch: 'rls1908_1'
+      - '2310':
+          branch: 'rls2310'
 
 - job-template:
-    name: 'csit-verify-tox-{stream}'
+    name: 'csit-verify-tox-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: ubuntu1804-us
+    node: 's-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}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - project-parameter:
@@ -50,10 +46,6 @@
       - gerrit-parameter:
           branch: '{branch}'
       - gerrit-refspec-parameter
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -66,23 +58,45 @@
           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
 
     publishers:
-      # TODO: Remove this when a voting pylint difference checker
-      # with nice enough output is implemented.
-      - violations:
-          pylint:
-            min: 10
-            max: 250
-            unstable: 250
-            pattern: 'pylint.log'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish