X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-icn-templates.yaml;h=9b2953c487a754d14b2f0375e4862832bb3d468e;hp=8e3c665cc1124b4895704fece3eb97cc3429f4b5;hb=f56e66973bbb61d444b514b19609ec3294a25cba;hpb=9a9833b1f48b3a95a32816c411297cd3c6b2d1c8

diff --git a/jjb/akraino-templates/akraino-icn-templates.yaml b/jjb/akraino-templates/akraino-icn-templates.yaml
index 8e3c665..9b2953c 100644
--- a/jjb/akraino-templates/akraino-icn-templates.yaml
+++ b/jjb/akraino-templates/akraino-icn-templates.yaml
@@ -1,96 +1,133 @@
 ---
 #
-## Copyright (c) 2019 Intel Corporation
-##
-## 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.
-##
+# Copyright (c) 2019 Intel Corporation. All rights reserved.
 #
-- job-template:
-    id: akraino-project-stream-verify-gate
-    name: '{project-name}-{stream}-verify-{gate}'
+# 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.
+#
+
+- daaas_job_boiler_plate: &daaas_job_boiler_plate
+    name: daaas_job_boiler_plate
     archive-artifacts: >
       **/*.log
     build-days-to-keep: 30
     build-timeout: 60
     stream: master
-    gate: bashate
     project-type: freestyle
     submodule-recursive: true
-    node: '{build-node}'
+    concurrent: true
+    node: "{build-node}"
 
     properties:
       - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
-          lftools-version: '{lftools-version}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
+          lftools-version: "{lftools-version}"
 
       - string:
           name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
+          default: "{archive-artifacts}"
           description: Artifacts to archive to the logs server.
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/{project}.git'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}/{project}.git"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
           submodule-disable: false
-          choosing-strategy: 'gerrit'
+          choosing-strategy: "gerrit"
+
+    builders:
+      - shell: "{obj:script}"
+
+    publishers:
+      - lf-infra-publish
+
+#################
+# JOB TEMPLATES #
+#################
+- job-template:
+    # Job template for verify jobs
+
+    name: "{project-name}-{stream}-{type}-verify"
+    <<: *daaas_job_boiler_plate
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"
           trigger-on:
             - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - change-merged-event
+                exclude-drafts: "false"
+                exclude-trivial-rebase: "false"
+                exclude-no-code-change: "false"
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: 'recheck'
+                comment-contains-value: "recheck"
             - comment-added-contains-event:
-                comment-contains-value: 'reverify'
+                comment-contains-value: "reverify"
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: ANT
-                  pattern: '**/*'
-              disable-strict-forbidden-file-verification: 'true'
+                - compare-type: REG_EXP
+                  pattern: ".*/?{path}/.*"
+              disable-strict-forbidden-file-verification: "true"
               forbidden-file-paths:
                 - compare-type: ANT
-                  pattern: 'docs/**'
+                  pattern: "docs/**"
           readable-message: true
 
-    builders:
-      - shell: 'make {gate}'
+- job-template:
+    # Job template for merge jobs
 
-    publishers:
-      - lf-infra-publish
+    name: "{project-name}-{stream}-{type}-merge"
+    <<: *daaas_job_boiler_plate
+
+    gerrit_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: remerge$
+
+    triggers:
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"
+          projects:
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: ".*/?{path}/.*"
+              disable-strict-forbidden-file-verification: "true"
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: "docs/**"
+          readable-message: true