Add Sodium Jobs for Netvirt

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 60e6435d9200ce1580171fe47683e5464ed56dea..ef6157e41f7d94ec9d40d774dd90e38407c537cc 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -81,7 +81,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -187,7 +187,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -490,7 +490,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job Configuration #
@@ -599,7 +599,7 @@
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -895,7 +895,16 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    docker_system_count: 1
+    docker_system_flavor: 'odl-standard-1'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
 
     #####################
     # Job Configuration #
@@ -915,6 +924,13 @@
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{docker_system_count}'
+          vm_1_flavor: '{docker_system_flavor}'
+          vm_1_image: '{docker_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -942,14 +958,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{docker_system_count}'
-          vm_1_flavor: '{docker_system_flavor}'
-          vm_1_image: '{docker_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -999,6 +1011,8 @@
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
@@ -1013,7 +1027,22 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-4-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    openstack_system_count: 1
+    openstack_system_flavor: 'odl-standard-4'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_count: 0
+    openstack_system2_flavor: 'odl-standard-1'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -1033,6 +1062,19 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1178,20 +1220,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack-4-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
+      - integration-stack-4-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -1214,6 +1246,8 @@
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
@@ -1246,6 +1280,19 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1392,7 +1439,22 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-4-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    openstack_system_count: 1
+    openstack_system_flavor: 'odl-standard-4'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_count: 0
+    openstack_system2_flavor: 'odl-standard-1'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366'
 
     #####################
     # Job configuration #
@@ -1412,6 +1474,19 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1561,20 +1636,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack-4-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
+      - integration-stack-4-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -1597,6 +1662,8 @@
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
@@ -1629,6 +1696,19 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1893,7 +1973,9 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-apex-3-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
 
     #####################
     # Job configuration #
@@ -1913,6 +1995,16 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-3-type:
+          vm_0_count: '{apex_controller_count}'
+          vm_0_flavor: '{apex_controller_flavor}'
+          vm_0_image: '{apex_controller_image}'
+          vm_1_count: 1
+          vm_1_flavor: '{apex_compute_0_flavor}'
+          vm_1_image: '{apex_compute_0_image}'
+          vm_2_count: 1
+          vm_2_flavor: '{apex_compute_1_flavor}'
+          vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1967,17 +2059,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-apex-stack-3-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{apex_controller_count}'
-          vm_0_flavor: '{apex_controller_flavor}'
-          vm_0_image: '{apex_controller_image}'
-          vm_1_count: '1'
-          vm_1_flavor: '{apex_compute_0_flavor}'
-          vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: '1'
-          vm_2_flavor: '{apex_compute_1_flavor}'
-          vm_2_image: '{apex_compute_1_image}'
+      - integration-stack-3-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - integration-detect-variables
       - integration-install-common-functions
@@ -1998,6 +2083,8 @@
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
@@ -2030,6 +2117,16 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-3-type:
+          vm_0_count: '{apex_controller_count}'
+          vm_0_flavor: '{apex_controller_flavor}'
+          vm_0_image: '{apex_controller_image}'
+          vm_1_count: 1
+          vm_1_flavor: '{apex_compute_0_flavor}'
+          vm_1_image: '{apex_compute_0_image}'
+          vm_2_count: 1
+          vm_2_flavor: '{apex_compute_1_flavor}'
+          vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream: