Merge "Remove basic test suites"

diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst
index 5389a3a8fea5981e95a348191d6e9ee4872ce85e..f22d04849cd792e3dcc5e9797a71a92504b076cb 100644 (file)
--- a/jjb/integration/csit-jobs-fluorine.lst
+++ b/jjb/integration/csit-jobs-fluorine.lst
@@ -47,12 +47,6 @@ netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-snat-conntrac
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
-netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-fluorine,
-netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-itm-direct-tunnels-fluorine,
-netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
-netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-fluorine,
-netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine,
-netvirt-csit-3node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine,
 netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-pike-upstream-stateful-fluorine,

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c5a7861a5405ad9753e522a2ce709ea1ca6943d3..02c805a84d6afe2b5154a2430776e4e2f1c19ca9 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -128,7 +128,8 @@
 - job-template:
     name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
     id: inttest-csit-1node
-    disabled: false
+    disable-job: false
+    disabled: '{disable-job}'
 
     project-type: freestyle
     node: centos7-robot-2c-8g

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 65482ff29b024d3fc7656ed58ddef7b9ca55fdf6..a01c97fc75e216601ff6b266f8ca84aa90eccde0 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -12,7 +12,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-ci-workshop
@@ -26,7 +26,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-common-packer
@@ -44,7 +44,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-docs
@@ -62,7 +62,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-docs-conf
@@ -80,7 +80,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-global-jjb
@@ -98,7 +98,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-lftools
@@ -116,7 +116,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - project:
     name: lf-infra-license-checker
@@ -130,7 +130,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - view:
     name: lf-infra

diff --git a/jjb/lfn/lfn.yaml b/jjb/lfn/lfn.yaml
index 74b9a140f99d1f4e23b733978fb673b4c0ba555c..505a86a53a0cf70bb60ec0fba134bbf892e25721 100644 (file)
--- a/jjb/lfn/lfn.yaml
+++ b/jjb/lfn/lfn.yaml
@@ -15,7 +15,7 @@
     branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
-    gerrit-server-name: LinuxFoundation
+    gerrit-server-name: lf-releng
 
 - view:
     name: lfn

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index b29c3ce7df0a8bb0d644ad421819aeab6b277ce9..0f36f54fe2a90722147fc89ee399f8563d655062 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: 'mdsal'
+    disable-job: true
 
     # The functionality under test
     functionality: 'bindingv1'