Merge "Remove opflex carbon jobs"

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index cd16b8530f02a0a382b333ae42d185d5dcfef217..0c37c0bb49b0f58c9bb7b6367d5518252bce164b 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -67,26 +67,26 @@
 
     # Distribution bundle URL
     bundle-url: 'last'
+    repo-url: ''
 
     # CSIT images configuration
-    openstack_system_image_newton: 'CentOS 7 - devstack-newton - 20171014-2147'
     openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
-    docker_system_flavor: v2-standard-1
-    docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
+    docker_system_flavor: odl-standard-1
+    docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311
     odl_system_count: 1
-    odl_system_flavor: v2-standard-2
+    odl_system_flavor: odl-highcpu-4
     odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
-    openstack_system_flavor: v2-standard-4
+    openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: v2-standard-1
+    openstack_system2_flavor: odl-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v2-highcpu-2
+    tools_system_flavor: odl-highcpu-2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options
@@ -106,7 +106,6 @@
     # Maven / Java
     java-version: 'openjdk8'
     jre: 'openjdk8'
-    jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode
@@ -183,18 +182,31 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-fluorine: >
+        netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-oxygen
+        netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
     csit-high-frequency-list-nitrogen: >
-        netvirt-csit-1node-openstack-ocata-upstream-stateful-nitrogen
+        netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen
     csit-high-frequency-list-carbon: >
-        netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon
+    csit-sanity-list-fluorine: >
+        openflowplugin-csit-1node-sanity-only-fluorine
     csit-sanity-list-oxygen: >
         openflowplugin-csit-1node-sanity-only-oxygen
     csit-sanity-list-nitrogen: >
         openflowplugin-csit-1node-sanity-only-nitrogen
     csit-sanity-list-carbon: >
         openflowplugin-csit-1node-sanity-only-carbon
+    csit-weekly-list-fluorine: >
+        controller-csit-1node-notifications-longevity-only-fluorine,
+        controller-csit-3node-drb-partnheal-longevity-only-fluorine,
+        controller-csit-3node-drb-precedence-longevity-only-fluorine,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-fluorine,
+        bgpcep-csit-3node-bgpclustering-longevity-only-fluorine,
+        distribution-deploy-fluorine,
+        distribution-offline-fluorine,
+        openflowplugin-csit-1node-longevity-only-fluorine
     csit-weekly-list-oxygen: >
         controller-csit-1node-notifications-longevity-only-oxygen,
         controller-csit-3node-drb-partnheal-longevity-only-oxygen,