From: chengli3 <cheng1.li@intel.com>
Date: Tue, 29 Oct 2019 01:59:59 +0000 (+0800)
Subject: Add verify_nestedk8s job
X-Git-Tag: v0.4.0~59
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=46a64eeed5307a91ed1a8bcb657320851332db73;p=icn.git

Add verify_nestedk8s job

Signed-off-by: chengli3 <cheng1.li@intel.com>
Change-Id: Iec1e1b47a00097cee9b1a2d1ee596c5a0e288dfd
---

diff --git a/Makefile b/Makefile
index dbf0439..a0b4c86 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ bpa_rest_api_unit:
 	pushd $(BPA_REST_API) && make unit_test && popd
 
 bashate:
-	bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -name *.sh`
+	bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -not -path './ci/jjb/shell/*' -name *.sh`
 
 prerequisite:
 	pushd $(ENV) && ./cd_package_installer.sh && popd
diff --git a/ci/jjb/akraino-icn-templates.yaml b/ci/jjb/akraino-icn-templates.yaml
index f610a88..b2367ef 100644
--- a/ci/jjb/akraino-icn-templates.yaml
+++ b/ci/jjb/akraino-icn-templates.yaml
@@ -1,13 +1,14 @@
 ---
 - job-template:
-    id: icn-stream-verify
-    name: 'icn-{stream}-verify'
+    id: icn-stream-verify-target
+    name: 'icn-{stream}-verify-{target}'
     defaults: icn
     archive-artifacts: >
       **/*.log
     build-days-to-keep: 30
     build-timeout: 60
     stream: master
+    target: verifier
     project-type: freestyle
     submodule-recursive: true
     #node: '{build-node}'
@@ -53,7 +54,7 @@
       - timed: "@midnight"
 
     builders:
-      - shell: !include-raw-escape:
+      - shell: !include-raw:
           - shell/verify.sh
 
     publishers:
diff --git a/ci/jjb/project.yaml b/ci/jjb/project.yaml
index e1aa2de..eb0415f 100644
--- a/ci/jjb/project.yaml
+++ b/ci/jjb/project.yaml
@@ -4,8 +4,11 @@
     project: icn
     project-name: icn
     nexus_log_subdir: intel/ICN_CD_logs
+    target:
+      - verifier
+      - verify_nestedk8s
     stream:
       - master:
           branch: master
     jobs:
-      - icn-stream-verify
+      - icn-stream-verify-target
diff --git a/ci/jjb/shell/verify.sh b/ci/jjb/shell/verify.sh
index 1bb45ce..a5e68fa 100644
--- a/ci/jjb/shell/verify.sh
+++ b/ci/jjb/shell/verify.sh
@@ -5,9 +5,9 @@ echo "---> verify.sh"
 # Disable 'globbing'
 set -exuf -o pipefail
 
-function clean_vm {
+function clean_vm {{
     vagrant destroy -f
-}
+}}
 trap clean_vm EXIT
 
 vagrant destroy -f
@@ -19,5 +19,5 @@ sudo resize2fs /dev/sda3
 sudo apt update
 sudo apt install -y make
 cd /vagrant
-sudo su -c 'make verifier'
+sudo su -c 'make {target}'
 "