Netvirt CSIT to run as SM project

Change-Id: If86f7fe150b55d9b417d1c1c1c97231b6a05ffe3
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f2a70310fe3db36533a75205063e0a55ee5a46bf..b74e924efaada461e00c98770b343149e2006206 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,7 @@
 ---
 ---

+default_language_version:
+  python: python3
+  node: "14.13.0"

 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.5.0
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.5.0


@@ -6,8 +9,8 @@ repos:
       - id: check-json
       - id: trailing-whitespace
 
       - id: check-json
       - id: trailing-whitespace
 

-  - repo: https://github.com/prettier/prettier
-    rev: 2.0.5
+  - repo: https://github.com/prettier/pre-commit
+    rev: v2.1.2

     hooks:
       - id: prettier
 
     hooks:
       - id: prettier
 

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index dc75bac573c239843cfebdebfc32b6edf763b5ce..2ae17b23ea1e92293a9360a95e61ecd785616151 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -70,7 +70,6 @@
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
             netconf-maven-merge-{stream},
             jsonrpc-maven-merge-{stream},
             lispflowmapping-maven-merge-{stream},
             netconf-maven-merge-{stream},

-            netvirt-maven-merge-{stream}

             neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},
             neutron-maven-merge-{stream},
             openflowplugin-maven-merge-{stream},
             ovsdb-maven-merge-{stream},

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 5cc8f45deab276204219ea5e965c462b24e2db46..584a3951107d1a99b08da849735e57ffaf8c378d 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -26,7 +26,7 @@
           csit-list: !include: csit-jobs-silicon.lst
           build-order: >
             odlparent yangtools mdsal controller infrautils serviceutils aaa netconf
           csit-list: !include: csit-jobs-silicon.lst
           build-order: >
             odlparent yangtools mdsal controller infrautils serviceutils aaa netconf

-            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
+            daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping

             bgpcep integration/distribution
 
       - aluminium:
             bgpcep integration/distribution
 
       - aluminium:


@@ -65,13 +65,10 @@
           branch: "master"
           csit-blocklist: >
             bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo
           branch: "master"
           csit-blocklist: >
             bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo

-            odlmicro p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
-            gate longevity sanity tdd tempest wip
+            netvirt odlmicro p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
+            yangtools gate longevity sanity tdd tempest wip

             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only

-            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
-            netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
-            netvirt-csit-3node-1cmb

             openflowplugin-csit-1node-bundle-based-reconciliation
             last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
           csit-list: !include: csit-jobs-silicon.lst
             openflowplugin-csit-1node-bundle-based-reconciliation
             last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
           csit-list: !include: csit-jobs-silicon.lst