X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-vpp-device.yaml;h=4f2fd78695f76d47a647c885279460f89a58e893;hb=f4949b340cf51c4e155ee86a54334fb997c233f8;hp=9fb768a5d4b345f79a2590947a07524ef5a04d95;hpb=9d70c744cd4b65ca2e6ed7be5742aa56f0b85b76;p=ci-management.git

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 9fb768a5d..4f2fd7869 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -22,48 +22,44 @@
       - '1n-tx2':
           executor: 'vpp-csit-arm-ubuntu18'
           skip-vote: 'true'
-          trigger: 'gerrit-trigger-csit-vpp-devicetest-manual'
     jobs:
       - 'csit-vpp-device-{stream}-{os}-{node-arch}'
-      - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
-      - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
-      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
-      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
+      - 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly':
+          stream:
+            - master:
+                branch: 'master'
+                branch-id: 'oper'
+            - '2009_lts':
+                branch: 'rls2009_lts'
+                branch-id: 'oper-rls2009_lts'
+      - 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly':
+          stream:
+            - master:
+                branch: 'master'
+                branch-id: 'oper'
+            - '2009_lts':
+                branch: 'rls2009_lts'
+                branch-id: 'oper-rls2009_lts'
 
     project: 'csit'
     executor: 'vpp-csit-device'
     branch: 'master'
     branch-id: 'oper'
-    trigger: 'gerrit-trigger-csit-vpp-devicetest-full'
-    stream_timed:
-      - master:
-          branch: 'master'
-          branch-id: 'oper'
-      - '2001':
-          branch: 'rls2001'
-          branch-id: 'oper-rls2001'
     stream:
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
-      - '1908':
-          branch: 'rls1908_1'
-          branch-id: 'oper-rls1908_1'
-      - '2001':
-          branch: 'rls2001'
-          branch-id: 'oper-rls2001'
+      - '2005':
+          branch: 'rls2005'
+          branch-id: 'oper-rls2005'
+      - '2009':
+          branch: 'rls2009'
+          branch-id: 'oper-rls2009'
+      - '2009_lts':
+          branch: 'rls2009_lts'
+          branch-id: 'oper-rls2009_lts'
     exclude:
-      - stream: '1904'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - stream_timed: '1908'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - stream_timed: 'master'
-        os: 'ubuntu1804'
+      - stream: '2005'
         node-arch: '1n-tx2'
 
 - job-template:
@@ -145,26 +141,29 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - '{trigger}':
+      - 'gerrit-trigger-csit-vpp-devicetest-full':
           project: '{project}'
           branch: '{branch}'
           skip-vote: '{skip-vote}'
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/device-verify.sh
 
     publishers:
       - robot:
-          output-path: archive
+          output-path: 'archives'
           other-files:
             - '*.*'
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly'
     description: |
       <ul>
           <li>objective
@@ -235,20 +234,23 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/device-semiweekly.sh
 
     publishers:
       - robot:
-          output-path: 'csit/archive'
+          output-path: 'archives'
           other-files:
             - '*.*'
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly'
     description: |
       <ul>
           <li>objective
@@ -322,170 +324,14 @@
     builders:
       - shell:
           !include-raw-escape:
-          - ../scripts/csit/device-verify.sh
-
-    publishers:
-      - robot:
-          output-path: archive
-          other-files:
-            - '*.*'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
-    description: |
-      <ul>
-          <li>objective
-              <ul>
-                  <li>Validate CSIT code of corresponding branch against
-                      verified vpp build from corresponding branch.
-              </ul>
-          <li>executor
-              <ul>
-                  <li>vpp-csit-arm-ubuntu18
-              </ul>
-          <li>test-cases selection
-              <ul>
-                  <li>pre-selected test-cases
-                  <li>all test-cases are labelled with CSIT RF topic tags
-                      defined in <i>csit/docs/tag_documentation.rst</i>
-              </ul>
-          <li>default tags for vpp-device test type
-              <ul>
-                  <li>devicetest
-              </ul>
-          <li>results
-              <ul>
-                  <li>jjb verify: PASS/FAIL
-                  <li>present: no
-                  <li>analyse: no
-              </ul>
-      </ul>
-
-    project-type: freestyle
-    node: 'vpp-csit-arm-ubuntu18'
-    concurrent: false
-    archive-artifacts: 'archive/*.*'
-    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}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1804'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-
-    scm:
-      - git-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          branch: '{branch}'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - timed: '0 * * * *'
-
-    builders:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/device-verify.sh
 
     publishers:
       - robot:
-          output-path: archive
-          other-files:
-            - '*.*'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
-    description: |
-      <ul>
-          <li>objective
-              <ul>
-                  <li>Validate latest vpp build from corresponding branch stored
-                      in nexus against verified CSIT codebase of corresponding
-                      branch.
-              </ul>
-          <li>executor
-              <ul>
-                  <li>vpp-csit-arm-ubuntu18
-              </ul>
-          <li>test-cases selection
-              <ul>
-                  <li>pre-selected test-cases
-                  <li>all test-cases are labelled with CSIT RF topic tags
-                      defined in <i>csit/docs/tag_documentation.rst</i>
-              </ul>
-          <li>default tags for vpp-device test type
-              <ul>
-                  <li>devicetest
-              </ul>
-          <li>results
-              <ul>
-                  <li>jjb verify: PASS/FAIL
-                  <li>present: no
-                  <li>analyse: no
-              </ul>
-      </ul>
-
-    project-type: freestyle
-    node: 'vpp-csit-arm-ubuntu18'
-    concurrent: false
-    archive-artifacts: 'csit/archive/*.*'
-    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}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: 'ubuntu1804'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - timed: '30 * * * *'
-
-    builders:
-      - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
-      - inject:
-          properties-file: variables.prop
-      - shell:
-          !include-raw-escape:
-          - ../scripts/csit/device-semiweekly.sh
-
-    publishers:
-      - robot:
-          output-path: 'csit/archive'
+          output-path: 'archives'
           other-files:
             - '*.*'
       - fdio-infra-shiplogs: