X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=07c3067a704b70606fdd7be81d7b22d88ede559c;hb=15d10cd60bdc3b6f1a5d4bb69306cba8f99b8b51;hp=bcc416db9606b1c8bb6fb33911b95eb86e2bcbdc;hpb=6b7305f3370399ed361e18fc48a155b84e3868c4;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index bcc416db9..07c3067a7 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -2,7 +2,8 @@
 - project:
     name: integration-test-jobs
     jobs:
-        - 'integration-csit-verify-1node-{stream}'
+        - 'integration-verify-python'
+        - 'integration-csit-verify-1node-library'
         - 'integration-distribution-offline-{stream}'
         - 'integration-distribution-test-{stream}'
         - 'integration-patch-test-{stream}'
@@ -132,8 +133,65 @@
         aaa-distribution-{stream},
         integration-distribution-merge-{stream}
 
+# Template: integration-verify-python
+# Goal: Verify python scripts correct syntax
+# Operation: This job template performs a python tox check on any integration/test patch
+
 - job-template:
-    name: 'integration-csit-verify-1node-{stream}'
+    name: 'integration-verify-python'
+
+    project-type: freestyle
+    node: dynamic_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: 'integration/test'
+
+    scm:
+        - integration-gerrit-scm:
+            credentials-id: '{ssh-credentials}'
+            basedir: 'test'
+            refspec: '$GERRIT_REFSPEC'
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - integration-trigger-patch-submitted:
+            name: 'integration/test'
+            branch: 'master'
+            pattern: '**'
+
+    builders:
+        - shell: |
+            virtualenv $WORKSPACE/venv-tox
+            source $WORKSPACE/venv-tox/bin/activate
+            pip install tox argparse
+            tox --version
+            cd $WORKSPACE/test
+            tox
+
+    publishers:
+        - email-notification:
+            email-prefix: '[integration]'
+
+# Template: integration-csit-verify-1node-library
+# Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
+# Operation: This job template performs a base openflow test when there is a change in the libraries folder
+
+- job-template:
+    name: 'integration-csit-verify-1node-library'
 
     project-type: freestyle
     node: dynamic_robot
@@ -146,9 +204,9 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/test'
         - integration-branch:
-            branch: '{branch}'
+            branch: 'master'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -161,10 +219,11 @@
             test-plan: 'openflowplugin-flow-services.txt'
 
     scm:
-        - gerrit-trigger-scm:
+        - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
+            basedir: 'test'
             refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            branch: 'master'
 
     wrappers:
         - build-timeout
@@ -177,14 +236,18 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - integration-csit-gerrit-trigger-patch-submitted:
-            name: 'integration'
-            branch: '{branch}'
+        - integration-trigger-patch-submitted:
+            name: 'integration/test'
+            branch: 'master'
+            pattern: 'csit/libraries/*'
 
     builders:
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
 
     publishers:
@@ -196,6 +259,11 @@
         - email-notification:
             email-prefix: '[integration]'
 
+# Template: integration-distribution-offline-{stream}
+# Goal: Verify distribution can start with no internet connection
+# Operation: This job deployes the controller removing any external repository definition
+# whenever there is a change in a kernel project (odlparent, controller, yangtools, etc...)
+
 - job-template:
     name: 'integration-distribution-offline-{stream}'
 
@@ -210,18 +278,12 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
             bundleurl: 'last'
 
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
@@ -234,6 +296,9 @@
             result: 'success'
 
     builders:
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-offline
 
     publishers:
@@ -242,6 +307,10 @@
         - email-notification:
             email-prefix: '[integration]'
 
+# Template: integration-distribution-test-{stream}
+# Goal: Verify a distribution through all system test available
+# Operation: This daily job template takes a distribution and passes all available system test
+
 - job-template:
     name: 'integration-distribution-test-{stream}'
 
@@ -272,6 +341,11 @@
         - email-notification:
             email-prefix: '[integration]'
 
+# Template: integration-patch-test-{stream}
+# Goal: Build a patch and run all available system test on a distribution containing the change
+# Operation: This job teamplate builds a patch, creates a distribution containing the patch, and
+# triggers the distribution test when test-integration is used in gerrit comments
+
 - job-template:
     name: 'integration-patch-test-{stream}'
 
@@ -287,14 +361,16 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
-        - integration-patch-git-url
+            project: '$GERRIT_PROJECT'
+        - integration-distribution-git-url
 
     scm:
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
+            basedir: '$GERRIT_PROJECT'
+            refspec: '$GERRIT_REFSPEC'
             branch: '{branch}'
-        - integration-git-scm:
+        - integration-distribution-scm:
             credentials-id: '{ssh-credentials}'
             branch: '{branch}'
 
@@ -338,7 +414,7 @@
 
     maven:
         maven-name: '{mvn33}'
-        root-pom: 'integration/pom.xml'
+        root-pom: 'distribution/pom.xml'
         goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: '{integration-settings}'