Separate the NSH SFC CI-management configuration to the CSIT.

	Fix some syntax errors.

Change-Id: I46be907dd24676c7fb2bfd380c1c35eb3ccec738
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 510cc6c..5fa820c 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -20,6 +20,8 @@
         - 'csit-vpp-perf-check-{stream}'
         - 'csit-vpp-perf-ndrchk-daily-master'
         - 'csit-vpp-perf-verify-{stream}'
+        - 'csit-nsh_sfc-verify-perf-{stream}'
+        - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
 
     project: 'csit'
     branch: 'master'
@@ -3688,6 +3690,108 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
+- job-template:
+    name: 'csit-nsh_sfc-verify-perf-{stream}'
+
+    project-type: freestyle
+    node: 'ubuntu1604-basebuild-4c-4g'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: 30
+
+    triggers:
+        - gerrit-trigger-manually-triggered:
+            name: '{project}'
+            branch: '{branch}'
+            comment-trigger-value: 'csit_nsh_sfc_perf'
+
+    builders:
+        - shell:
+            !include-raw-escape: jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'archive'
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
+
+    project-type: freestyle
+    node: '{os}-basebuild-4c-4g'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-manually-triggered:
+            name: '{project}'
+            branch: '{branch}'
+            comment-trigger-value: 'csit_nsh_sfc_func'
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'archive'
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - parameter:
     name: test-type-parameter
     parameters:

diff --git a/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh
new file mode 100644 (file)
index 0000000..3e88579
--- /dev/null
+++ b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -xeu -o pipefail
+
+# execute nsh_sfc bootstrap script if it exists
+if [ -e bootstrap-nsh_sfc-functional-virl.sh ]
+then
+    # make sure that bootstrap-nsh_sfc-functional-virl.sh is executable
+    chmod +x bootstrap-nsh_sfc-functional-virl.sh
+    # run the script
+    ./bootstrap-nsh_sfc-functional-virl.sh
+else
+    echo 'ERROR: No bootstrap-nsh_sfc-functional-virl.sh found'
+    exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :

diff --git a/jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh b/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
similarity index 100%
rename from jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh
rename to jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh

diff --git a/jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-csit-functional-virl.sh
similarity index 98%
rename from jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh
rename to jjb/nsh_sfc/include-raw-nsh_sfc-csit-functional-virl.sh
index 87dd9b8..f2144c2 100644 (file)
--- a/jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh
+++ b/jjb/nsh_sfc/include-raw-nsh_sfc-csit-functional-virl.sh
@@ -7,7 +7,7 @@ git clone https://gerrit.fd.io/r/csit
 # If the git clone fails, complain clearly and exit
 if [ $? != 0 ]; then
     echo "Failed to run: git clone https://gerrit.fd.io/r/csit"
-exit
+    exit 1
 fi
 
 cd csit

diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-csit-perf-hw.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-csit-perf-hw.sh
new file mode 100644 (file)
index 0000000..98b1d07
--- /dev/null
+++ b/jjb/nsh_sfc/include-raw-nsh_sfc-csit-perf-hw.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -xeu -o pipefail
+
+# Clone csit and start tests
+git clone https://gerrit.fd.io/r/csit
+
+# If the git clone fails, complain clearly and exit
+if [ $? != 0 ]; then
+    echo "Failed to run: git clone https://gerrit.fd.io/r/csit"
+    exit 1
+fi
+
+cd csit
+
+# execute  nsh_sfc bootstrap script if it exists
+if [ ! -e bootstrap-verify-perf-nsh_sfc.sh ]
+then
+    echo 'ERROR: No bootstrap-verify-perf-nsh_sfc.sh found'
+    exit 1
+fi
+
+# make sure that bootstrap-verify-perf.sh is executable
+chmod +x bootstrap-verify-perf-nsh_sfc.sh
+# run the script
+./bootstrap-verify-perf-nsh_sfc.sh
+
+# vim: ts=4 ts=4 sts=4 et :

diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index 7d630be..c445902 100644 (file)
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -7,8 +7,6 @@
         - 'nsh_sfc-verify-image-{stream}-{os}'
         - 'nsh_sfc-verify-docs-{stream}'
         - 'nsh_sfc-merge-docs-{stream}'
-        - 'csit-nsh_sfc-verify-perf-{stream}'
-        - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
 
     project: 'nsh_sfc'
     os:
@@ -28,6 +26,32 @@
             branch: 'stable/1704'
             repo-stream-part: 'stable.1704'
 
+- project:
+    name: nsh_sfc-misc
+    jobs:
+        - 'nsh_sfc-csit-verify-perf-{stream}'
+        - 'nsh_sfc-csit-verify-func-{stream}-{os}-virl'
+
+    project: 'nsh_sfc'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - '1609':
+            branch: 'stable/1609'
+            repo-stream-part: 'stable.1609'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1609'
+        - '1704':
+            branch: 'stable/1704'
+            repo-stream-part: 'stable.1704'
+        - '1707':
+            branch: 'stable/1707'
+            repo-stream-part: 'stable.1707'
+
+    os: ubuntu1604
+
 - job-template:
     name: 'nsh_sfc-verify-{stream}-{os}'
 
@@ -456,7 +480,7 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-nsh_sfc-verify-perf-{stream}'
+    name: 'nsh_sfc-csit-verify-perf-{stream}'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
@@ -473,6 +497,10 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
 
     scm:
         - gerrit-trigger-scm:
@@ -488,25 +516,25 @@
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
-            comment-trigger-value: 'nsh_sfc_perf_weekly'
+            comment-trigger-value: 'nsh_sfc_perf'
 
     builders:
         - shell:
-            !include-raw-escape: jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh
+            !include-raw-escape: include-raw-nsh_sfc-csit-perf-hw.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/output_perf_data.xml'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit/archive'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
+    name: 'nsh_sfc-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
@@ -526,7 +554,7 @@
         - os-parameter:
             os: '{os}'
         - repo-name-parameter:
-            repo-name: '{repo-stream-part}.{repo-os-part}'
+            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
 
     scm:
         - gerrit-trigger-scm:
@@ -546,15 +574,15 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh
+            !include-raw-escape: include-raw-nsh_sfc-csit-functional-virl.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit/archive'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'