Added TSDR CSIT Jobs into distribution-test Job

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 712dd226b4cd11b611c21f464c4b1c53e7387aff..9e85088a10ca71d5cbb33a3781c854c88494bcee 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -1,13 +1,14 @@
-
 - project:
-    name: integration-test-jobs
+    name: integration-test
     jobs:
-        - 'integration-verify-python'
+        - '{name}-verify-python-{stream}'
         - 'integration-csit-verify-1node-library'
         - 'integration-distribution-test-{stream}'
         - 'integration-patch-test-{stream}'
         - 'integration-multipatch-test-{stream}'
 
+    project: integration/test
+
     stream:
         - boron:
             branch: 'master'
@@ -21,7 +22,6 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                integration-csit-3node-basic-only-{stream},
                 integration-distribution-deploy-{stream},
                 integration-distribution-offline-{stream},
                 l2switch-csit-1node-switch-only-{stream},
@@ -55,8 +55,6 @@
                 ovsdb-csit-1node-southbound-all-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
                 packetcable-csit-1node-pcmm-all-{stream},
-                snmp-csit-1node-basic-only-{stream},
-                snmp-csit-1node-basic-all-{stream},
                 sxp-csit-1node-basic-only-{stream},
                 sxp-csit-1node-basic-all-{stream},
                 sxp-csit-1node-filtering-only-{stream},
@@ -65,7 +63,9 @@
                 sxp-csit-1node-topology-all-{stream},
                 topoprocessing-csit-1node-topology-operations-all-{stream},
                 topoprocessing-csit-1node-topology-operations-only-{stream},
+                tsdr-csit-1node-cassandra-datastore-only-{stream},
                 tsdr-csit-1node-hbase-datastore-only-{stream},
+                tsdr-csit-1node-hsqldb-datastore-only-{stream},
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
                 vpnservice-csit-1node-vpnservice-only-{stream},
@@ -84,7 +84,6 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                integration-csit-3node-basic-only-{stream},
                 integration-distribution-offline-{stream},
                 integration-distribution-deploy-{stream},
                 l2switch-csit-1node-switch-only-{stream},
@@ -128,7 +127,9 @@
                 sxp-csit-1node-topology-all-{stream},
                 topoprocessing-csit-1node-topology-operations-all-{stream},
                 topoprocessing-csit-1node-topology-operations-only-{stream},
+                tsdr-csit-1node-cassandra-datastore-only-{stream},
                 tsdr-csit-1node-hbase-datastore-only-{stream},
+                tsdr-csit-1node-hsqldb-datastore-only-{stream},
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
                 vpnservice-csit-1node-vpnservice-only-{stream},
@@ -149,7 +150,6 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                integration-csit-3node-basic-only-{stream},
                 integration-distribution-offline-{stream},
                 l2switch-csit-1node-switch-only-{stream},
                 l2switch-csit-1node-switch-all-{stream},
@@ -186,61 +186,6 @@
                 vtn-csit-1node-coordinator-only-{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-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'
-        - integration-patch-refspec:
-            branch: '$GERRIT_REFSPEC'
-
-    scm:
-        - integration-gerrit-scm:
-            credentials-id: '{ssh-credentials}'
-            basedir: 'test'
-            refspec: '$PATCHREFSPEC'
-            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
@@ -262,6 +207,8 @@
             project: 'integration/test'
         - integration-branch:
             branch: 'stable/beryllium'
+        - integration-distribution-stream:
+            stream: 'beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -274,7 +221,9 @@
                 odl-bgpcep-bgp,
                 odl-netconf-connector-all
         - integration-test-options:
-            test-options: '-e adsal -v TIMEOUT_BUG_4220:10s'
+            test-options: '-v TIMEOUT_BUG_4220:10s'
+        - integration-stream-test-plan:
+            stream-test-plan: 'test-libraries-beryllium.txt'
         - integration-test-plan:
             test-plan: 'test-libraries.txt'
         - integration-patch-refspec: