X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=dfb2652367e120cbf497b32bc78563c6cbbf8936;hb=105fb5fcaa598d3f2740b4545dc4597fc31d1eaa;hp=076d1fcee15a639372220ff01c76e1723634b65b;hpb=1436f8f5f24783f9d3fae45f4344377f1a32cf68;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 076d1fcee..dfb265236 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,168 +1,257 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-neon
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium-rocky
     jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'neon'
-    branch: 'master'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+      - inttest-csit-hwvtep-openstack-custom
+
+    project: "netvirt"
+    stream: "aluminium"
+    branch: "master"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200811-124233.615
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
+    enable-networking-l2gw: "yes"
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
       - 3node:
-          openstack_system2_count: 2
+          openstack_system2_count: 3
           odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
-      - upstream-stateful
+      - upstream-stateful:
+          schedule: "{schedule-daily}"
       - gate-stateful
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+      - rocky:
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-fluorine
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
     jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'master'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+      - inttest-csit-hwvtep-openstack-custom
+
+    project: "netvirt"
+    stream: "aluminium"
+    branch: "master"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200811-124233.615
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
+    enable-networking-l2gw: "yes"
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
       - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
+
+    functionality:
+      - upstream-stateful:
+          schedule: "{schedule-daily}"
+      - gate-stateful
+
+    openstack:
+      - stein:
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"
+
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-magnesium-rocky
+    jobs:
+      - inttest-csit-hwvtep-openstack-custom
+
+    project: "netvirt"
+    stream: "magnesium"
+    branch: "stable/magnesium"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200811-124233.615
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: "yes"
+
+    topology:
+      - 1node:
           openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+      - 3node:
+          openstack_system2_count: 3
           odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
-      - upstream-stateful
+      - upstream-stateful:
+          schedule: "{schedule-weekly}"
       - gate-stateful
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+      - rocky:
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"
+          schedule: "{schedule-daily}"
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-oxygen
+    name: netvirt-csit-hwvtep-openstack-integration-magnesium-stein
     jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'oxygen'
-    branch: 'stable/oxygen'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-8
+      - inttest-csit-hwvtep-openstack-custom
+
+    project: "netvirt"
+    stream: "magnesium"
+    branch: "stable/magnesium"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
     tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20180723-235543.774
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200811-124233.615
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
+    enable-networking-l2gw: "yes"
 
     topology:
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
       - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
+
+    functionality:
+      - upstream-stateful:
+          schedule: "{schedule-weekly}"
+      - gate-stateful
+
+    openstack:
+      - stein:
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"
+          schedule: "{schedule-weekly}"
+
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-sodium-rocky
+    jobs:
+      - inttest-csit-hwvtep-openstack-custom
+
+    project: "netvirt"
+    stream: "sodium"
+    branch: "stable/sodium"
+    testplan: "{project}-{topology}-l2gw-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,l2gw-plugin"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200811-124233.615
+    os-cmb-cnt: 0
+    os-ctl-cnt: 1
+    os-cmp-cnt: 2
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: "yes"
+
+    topology:
+      - 1node:
           openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: "no"
+          install-features: "odl-netvirt-openstack"
+      - 3node:
+          openstack_system2_count: 3
           odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
-      - upstream-stateful
+      - upstream-stateful:
+          schedule: "{schedule-weekly}"
       - gate-stateful
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+      - rocky:
+          openstack-branch: "stable/rocky"
+          odl-ml2-branch: "stable/rocky"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_rocky_system_image}"
+          openstack_system2_image: "{openstack_rocky_system_image}"
+          schedule: "{schedule-weekly}"