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 08f38032d46f6c9d61ec43144d7bafb02aadefe8..7da5ac97e6a428e38170e4303edd74ffa04b6aad 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-silicon-rocky
+    name: netvirt-csit-hwvtep-openstack-integration-master-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"
@@ -48,12 +48,12 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-silicon-stein
+    name: netvirt-csit-hwvtep-openstack-integration-master-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"
@@ -95,52 +95,3 @@
           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-aluminium-stein
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    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: v3-standard-2
-    openstack_system_flavor: v3-standard-8
-    openstack_system2_flavor: v3-standard-4
-    tools_system_count: 2
-    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
-      - 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}"