Rework CSIT jobs - 1 validates CSIT commits, 1 tests vpp debs.

Change-Id: I6e8b78fec5b458cfdac6864617cdbd342b6f0594
Signed-off-by: Stefan Kobza <skobza@cisco.com>

diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml
new file mode 100644 (file)
index 0000000..df2ec02
--- /dev/null
+++ b/jjb/csit/csit-vpp-functional.yaml
@@ -0,0 +1,64 @@
+- project:
+    name: csit-vpp-functional
+
+    jobs:
+        - 'csit-vpp-{functionality}'
+
+    project: 'csit'
+    branch: 'master'
+
+    functionality: 'functional'
+
+- job-template:
+    name: 'csit-vpp-{functionality}'
+
+    project-type: freestyle
+    node: verify
+    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}'
+        - string:
+            name: 'VPP_URLS'
+            default: ''
+            description: 'Space separated VPP *.deb URLs from nexus'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+        # - jclouds:
+        #     instances:
+        #         - multi-link:
+        #             cloud-name: 'Primary'
+        #             count: 3
+        #             stop-on-terminate: False
+
+    # No triggers section, as it is expected that his job is triggered by
+    # vpp verify/merge job.
+
+    builders:
+        # This is where we will need to insert a step with a script that pulls all the
+        # allocated IP addresses and injecting as vars into the env. (see Opendaylight script: include-raw-integration-get-slave-addresses.sh
+        # See jjb/integration from ODL
+        - shell:
+            !include-raw-escape include-raw-csit-build.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'report.html, log.html, output.xml'

diff --git a/jjb/csit/csit-vpp-bridge-domain.yaml b/jjb/csit/csit-vpp-pylint.yaml
similarity index 90%
rename from jjb/csit/csit-vpp-bridge-domain.yaml
rename to jjb/csit/csit-vpp-pylint.yaml
index 5b85563..c04beb6 100644 (file)
--- a/jjb/csit/csit-vpp-bridge-domain.yaml
+++ b/jjb/csit/csit-vpp-pylint.yaml
@@ -1,13 +1,13 @@
 - project:
-    name: csit-vpp-bridge-domain
+    name: csit-validate
 
     jobs:
-        - 'csit-vpp-{functionality}'
+        - 'csit-validate-{functionality}'
 
     project: 'csit'
     branch: 'master'
 
-    functionality: 'bridge-domain'
+    functionality: 'pylint'
 
 - job-template:
     name: 'csit-vpp-{functionality}'
@@ -55,7 +55,7 @@
         # allocated IP addresses and injecting as vars into the env. (see Opendaylight script: include-raw-integration-get-slave-addresses.sh
         # See jjb/integration from ODL
         - shell:
-            !include-raw-escape include-raw-csit-build.sh
+            !include-raw-escape include-raw-csit-pylint.sh
 
     publishers:
         - archive-artifacts:

diff --git a/jjb/csit/include-raw-csit-pylint.sh b/jjb/csit/include-raw-csit-pylint.sh
new file mode 100644 (file)
index 0000000..e680884
--- /dev/null
+++ b/jjb/csit/include-raw-csit-pylint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+find resources -name \*.py | xargs pylint --rcfile=pylint.cfg > pylint.log || true
+
+# vim: ts=4 ts=4 sts=4 et :