Merge "Expand rendered image name to include sec and ms"

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 8865090..632b30c 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -48,7 +48,7 @@
         - 'csit-nsh_sfc-verify-perf-{stream}'
         - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
         - 'csit-tldk-verify-func-{stream}-{os}-virl'
-        - 'csit-dmm-functional-{stream}-{os}-virl'
+        - 'csit-dmm-functional-{stream}-ubuntu1604-virl'
 
     project: 'csit'
     branch: 'master'
@@ -60,6 +60,9 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
+        - '1807':
+            branch: 'rls1807'
+            branch-id: 'oper-rls1807'
     stream:
         - master:
             branch: 'master'
@@ -76,6 +79,9 @@
         - '1804':
             branch: 'rls1804'
             branch-id: 'oper-rls1804'
+        - '1807':
+            branch: 'rls1807'
+            branch-id: 'oper-rls1807'
 
 
 - job-template:
@@ -1065,7 +1071,8 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: '0 2,16 * * *'
+        # - timed: '0 2,16 * * *'
+        - timed: '0 16 * * 1,3,5'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1204,7 +1211,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: true
 
     logrotate:
@@ -1425,10 +1432,10 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-dmm-functional-{stream}-{os}-virl'
+    name: 'csit-dmm-functional-{stream}-ubuntu1604-virl'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
     logrotate: