Merge "Add CSIT rls1908_2 branch"

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

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index cb7f648..8990fa0 100644 (file)
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -1,3 +1,16 @@
+# Copyright (c) 2020 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ---
 - project:
     name: csit-validate
@@ -10,8 +23,10 @@
     stream:
       - master:
           branch: 'master'
-      - '1901':
-          branch: 'rls1901'
+      - '1908_2':
+          branch: 'rls1908_2'
+      - '2001':
+          branch: 'rls2001'
 
 - job-template:
     name: 'csit-verify-tox-{stream}'
@@ -19,6 +34,9 @@
     project-type: freestyle
     node: ubuntu1804-us
     concurrent: true
+    archive-artifacts: '*.log'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -32,6 +50,10 @@
       - 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:
@@ -50,12 +72,10 @@
 
     builders:
       - shell:
-          ./resources/libraries/bash/entry/tox.sh
+          !include-raw-escape:
+          - ../scripts/csit/tox.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: '*.log'
-          latest-only: false
       # TODO: Remove this when a voting pylint difference checker
       # with nice enough output is implemented.
       - violations: