Feat!: Remove all stable/aluminium jobs

[releng/builder.git] / jjb / netvirt / netvirt-csit-hwvtep-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index dfb2652367e120cbf497b32bc78563c6cbbf8936..7da5ac97e6a428e38170e4303edd74ffa04b6aad 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-aluminium-rocky
+    name: netvirt-csit-hwvtep-openstack-integration-master-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
-
     project: "netvirt"
-    stream: "aluminium"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"
@@ -13,11 +12,10 @@
     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
+    odl_system_flavor: v3-standard-2
+    openstack_system_flavor: v3-standard-8
+    openstack_system2_flavor: v3-standard-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
@@ -38,8 +36,7 @@
           install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
-      - upstream-stateful:
-          schedule: "{schedule-daily}"
+      - upstream-stateful
       - gate-stateful
 
     openstack:
@@ -51,12 +48,12 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
+    name: netvirt-csit-hwvtep-openstack-integration-master-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: "netvirt"
-    stream: "aluminium"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"
@@ -64,114 +61,10 @@
     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"
-
-    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"
-
-    functionality:
-      - upstream-stateful:
-          schedule: "{schedule-weekly}"
-      - gate-stateful
-
-    openstack:
-      - 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-magnesium-stein
-    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
+    odl_system_flavor: v3-standard-2
+    openstack_system_flavor: v3-standard-8
+    openstack_system2_flavor: v3-standard-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
@@ -192,8 +85,7 @@
           install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
-      - upstream-stateful:
-          schedule: "{schedule-weekly}"
+      - upstream-stateful
       - gate-stateful
 
     openstack:
@@ -203,55 +95,3 @@
           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"
-
-    functionality:
-      - upstream-stateful:
-          schedule: "{schedule-weekly}"
-      - gate-stateful
-
-    openstack:
-      - 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}"