CSIT: Unify path for robot plugin

[ci-management.git] / jjb / vpp / vpp.yaml

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 95d8882..e911264 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -12,7 +12,7 @@
 #         TODO: see if there is a refspec that works without requiring
 #               use of get_gerrit_refspec and hand entering the result
 #               in the WebUI 'Build With Parameters' gerrit refspec field.
-#   - Use the following to import get_gerrit_refspec into a bash shell 
+#   - Use the following to import get_gerrit_refspec into a bash shell
 #         from the ci-management directory:
 #         $ eval "$(grep -A12 get_gerrit ./docker/scripts/lib_common.sh)"
 # [end] NOTES
@@ -21,7 +21,7 @@
 - project:
     name: vpp-checkstyle-x86_64
     jobs:
-      - 'vpp-checkstyle-verify-{stream}-{executor-arch}'
+      - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     stream:
       - master:
@@ -32,10 +32,6 @@
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
           branch-head-refspec: ''
-      - '2001':
-          branch: 'stable/2001'
-          repo-stream-part: 'stable.2001'
-          branch-head-refspec: ''
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -65,10 +61,6 @@
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
           branch-head-refspec: ''
-      - '2001':
-          branch: 'stable/2001'
-          repo-stream-part: 'stable.2001'
-          branch-head-refspec: ''
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -80,10 +72,35 @@
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu.bionic.main'
+    executor-arch: 'x86_64'
+# [end] VPP-X86_64 PROJECT
+
+# VPP-OS-EOL-X86_64 PROJECT
+- project:
+    name: vpp-os-eol-x86_64
+    jobs:
+      - 'vpp-verify-{stream}-{os}-{executor-arch}'
+      - 'vpp-merge-{stream}-{os}-{executor-arch}'
+    project: 'vpp'
+    make-parallel-jobs: '4'
+    stream:
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
+          branch-head-refspec: ''
+      - '2005':
+          branch: 'stable/2005'
+          repo-stream-part: 'stable.2005'
+          branch-head-refspec: ''
+      - '2009':
+          branch: 'stable/2009'
+          repo-stream-part: 'stable.2009'
+          branch-head-refspec: ''
+    os:
       - centos7:
           repo-os-part: 'centos7'
     executor-arch: 'x86_64'
-# [end] VPP-X86_64 PROJECT
+# [end] VPP-OS-EOL-X86_64 PROJECT
 
 # VPP-OS-IN-2009-X86_64 PROJECT
 #
@@ -118,6 +135,12 @@
           repo-stream-part: 'stable.2009'
           branch-head-refspec: ''
     os:
+      - centos8:
+          repo-os-part: 'centos8'
+      - debian9:
+          repo-os-part: 'stretch'
+      - debian10:
+          repo-os-part: 'buster'
       - ubuntu2004:
           repo-os-part: 'ubuntu.focal.main'
     executor-arch: 'x86_64'
@@ -162,28 +185,24 @@
 # 'vpp-os-in-XXXX-x86_64' project. If no OSes are being
 # tested then this project should be commented out.
 #
-- project:
-    name: vpp-beta-x86_64
-    jobs:
-      - 'vpp-beta-verify-{stream}-{os}-{executor-arch}':
-          comment-trigger-value: 'vpp-beta-verify'
-      - 'vpp-beta-merge-{stream}-{os}-{executor-arch}':
-          comment-trigger-value: 'vpp-beta-merge'
-    project: 'vpp'
-    make-parallel-jobs: '4'
-    stream:
-      - master:
-          branch: 'master'
-          repo-stream-part: 'master'
-          branch-head-refspec: ''
-    os:
-      - centos8:
-          repo-os-part: 'centos8'
-      - debian9:
-          repo-os-part: 'stretch'
-      - debian10:
-          repo-os-part: 'buster'
-    executor-arch: x86_64
+#- project:
+#    name: vpp-beta-x86_64
+#    jobs:
+#      - 'vpp-beta-verify-{stream}-{os}-{executor-arch}':
+#          comment-trigger-value: 'vpp-beta-verify'
+#      - 'vpp-beta-merge-{stream}-{os}-{executor-arch}':
+#          comment-trigger-value: 'vpp-beta-merge'
+#    project: 'vpp'
+#    make-parallel-jobs: '4'
+#    stream:
+#      - master:
+#          branch: 'master'
+#          repo-stream-part: 'master'
+#          branch-head-refspec: ''
+#    os:
+#      - debian10:
+#          repo-os-part: 'buster'
+#    executor-arch: x86_64
 # [end] VPP-BETA-X86_64 PROJECT
 
 # VPP-GCC-X86_64 PROJECT
@@ -200,9 +219,11 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
+          branch-head-refspec: ''
       - '2009':
           branch: 'stable/2009'
           repo-stream-part: 'stable.2009'
+          branch-head-refspec: ''
 # [end] VPP-GCC-X86_64 PROJECT
 
 # VPP-AARCH64 PROJECT
@@ -222,10 +243,6 @@
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
           branch-head-refspec: ''
-      - '2001':
-          branch: 'stable/2001'
-          repo-stream-part: 'stable.2001'
-          branch-head-refspec: ''
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -325,7 +342,6 @@
     device-executor: 'vpp-csit-device'
     executor: '{os}-us'
     skip-vote: 'false'
-    trigger: 'gerrit-trigger-vpp-csit-devicetest-full'
     stream:
       - master:
           branch: 'master'
@@ -333,9 +349,6 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
-      - '2001':
-          branch: 'stable/2001'
-          repo-stream-part: 'stable.2001'
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -346,7 +359,7 @@
       - 1n-skx
       - 1n-tx2:
           device-executor: 'vpp-csit-arm-ubuntu18'
-          trigger: 'gerrit-trigger-vpp-csit-devicetest-manual'
+          skip-vote: 'true'
     node-arch:
       - 2n-clx
       - 2n-skx
@@ -358,6 +371,14 @@
       - 3n-tsh:
           executor: 'ubuntu1804arm-s'
           make-parallel-jobs: '16'
+    exclude:
+      - stream: '1908'
+        device-node-arch: '1n-tx2'
+      - stream: '2001'
+        device-node-arch: '1n-tx2'
+      - stream: '2005'
+        device-node-arch: '1n-tx2'
+
 # [end] VPP-CSIT-PERPATCH PROJECT
 
 # VPP-CSIT-API-CRC PROJECT
@@ -408,7 +429,7 @@
 
 # VPP-CHECKSTYLE-VERIFY JOB TEMPLATE
 - job-template:
-    name: 'vpp-checkstyle-verify-{stream}-{executor-arch}'
+    name: 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'builder-{os}-prod-{executor-arch}'
@@ -500,6 +521,9 @@
             notbuilt: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/checkstyle.sh
@@ -569,6 +593,9 @@
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -633,6 +660,9 @@
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -709,7 +739,7 @@
               target: '/root'
       - shell:
           !include-raw-escape:
-          - ../scripts/vpp/checkstyle.sh
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -784,6 +814,9 @@
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -859,6 +892,9 @@
           files:
             - file-id: 'packagecloud_api'
               target: '/root'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/checkstyle.sh
@@ -915,7 +951,8 @@
           description: Artifacts to archive to the logs server.
       - make-parallel-jobs-parameter:
           make-parallel-jobs: '{make-parallel-jobs}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '{branch-head-refspec}'
 
     scm:
       - gerrit-trigger-scm:
@@ -933,6 +970,9 @@
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -1004,12 +1044,15 @@
           build-timeout: '90'
 
     triggers:
-      - '{trigger}':
+      - 'gerrit-trigger-vpp-csit-devicetest-full':
           name: '{project}'
           branch: '{branch}'
           skip-vote: '{skip-vote}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -1022,7 +1065,7 @@
 
     publishers:
       - robot-report:
-          output-path: 'csit_current/'
+          output-path: 'archives'
 
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
@@ -1101,6 +1144,9 @@
           skip-vote: true
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh
@@ -1170,6 +1216,9 @@
           branch: '{branch}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_ubuntu_docker_test.sh