X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Ftldk%2Ftldk.yaml;h=3939220f9527941ae56aaad4e1cf9c80a7c9d3b8;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=a91183cb2cc384627a892d3c3fabfcd50e703f5d;hpb=c377777a329df139dd98ac39563b3b62b3aee89a;p=ci-management.git

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index a91183cb2..3939220f9 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -1,16 +1,28 @@
+# Copyright (c) 2017 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: tldk
     jobs:
         - '{project}-verify-{stream}-{os}'
         - '{project}-merge-{stream}-{os}'
         - '{project}-verify-image-{stream}-{os}'
-        - 'csit-tldk-verify-func-{stream}-{os}-virl'
+        - 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project: 'tldk'
     os:
-        - ubuntu1404
         - ubuntu1604
-        - centos7
     stream:
         - master:
             branch: 'master'
@@ -22,7 +34,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -70,7 +82,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -130,7 +142,7 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -172,13 +184,13 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-tldk-verify-func-{stream}-{os}-virl'
+    name: 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -201,17 +213,18 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
+        - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
+            comment-trigger-value: 'verify-tldk-func'
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-csit-tldk-functional-virl.sh
+            !include-raw-escape: include-raw-tldk-csit-functional-virl.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml'
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
             latest-only: false
 
         - robot-report: