From 9e7f5f4636eb9623b8d1a33cf5816a3923d9f342 Mon Sep 17 00:00:00 2001
From: chengli3 <cheng1.li@intel.com>
Date: Wed, 20 Nov 2019 10:04:52 +0800
Subject: [PATCH] Update icn unit test job

1. Remove individual feature test plan. Because Jenkins can't vote
for multiple jobs. For example, we have two jobs for two different
features. If one job passes but another fails, Jenkins can't vote
both +1 and -1. So this patch merges all tests into a single one,
which follows the Akraino comminuty template.

2. Add icn view

Signed-off-by: chengli3 <cheng1.li@intel.com>
Change-Id: Ide8aa3fd9edd19bd3886bce622d9172c469768b7
---
 jjb/akraino-templates/akraino-icn-templates.yaml | 96 ------------------------
 jjb/icn/icn.yaml                                 |  6 +-
 2 files changed, 3 insertions(+), 99 deletions(-)
 delete mode 100644 jjb/akraino-templates/akraino-icn-templates.yaml

diff --git a/jjb/akraino-templates/akraino-icn-templates.yaml b/jjb/akraino-templates/akraino-icn-templates.yaml
deleted file mode 100644
index 8e3c665..0000000
--- a/jjb/akraino-templates/akraino-icn-templates.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
----
-#
-## 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.
-##
-#
-- job-template:
-    id: akraino-project-stream-verify-gate
-    name: '{project-name}-{stream}-verify-{gate}'
-    archive-artifacts: >
-      **/*.log
-    build-days-to-keep: 30
-    build-timeout: 60
-    stream: master
-    gate: bashate
-    project-type: freestyle
-    submodule-recursive: true
-    node: '{build-node}'
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
-          lftools-version: '{lftools-version}'
-
-      - string:
-          name: 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}'
-
-    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}'
-          submodule-disable: false
-          choosing-strategy: 'gerrit'
-
-    triggers:
-      - gerrit:
-          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
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: '**/*'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**'
-          readable-message: true
-
-    builders:
-      - shell: 'make {gate}'
-
-    publishers:
-      - lf-infra-publish
diff --git a/jjb/icn/icn.yaml b/jjb/icn/icn.yaml
index 3e6e685..2aa91bc 100644
--- a/jjb/icn/icn.yaml
+++ b/jjb/icn/icn.yaml
@@ -19,11 +19,11 @@
     name: icn
     project: icn
     project-name: icn
-    gate:
-      - bashate
     build-node: icn-dev
     stream:
       - master:
           branch: master
     jobs:
-      - akraino-project-stream-verify-gate
+      - akraino-project-stream-verify
+    views:
+      - project-view
-- 
2.16.6