From a34faeb895537c35ae553390e9b0663e9e4d91fe Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 24 Sep 2021 12:45:37 +0200
Subject: [PATCH] Cleanup netvirt CSIT naming

netvirt has two streams: master (self-managed) and aluminium (managed),
with the latter nearing removal. Prune all other branches and rename
silicon to master to stop automatic proliferation from happening.

Change-Id: I7a28bc1ddfa96023498ac2ff18710b33f3990dcf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../netvirt-csit-hwvtep-openstack.yaml        |  8 ++++----
 .../netvirt-csit-multi-openstack-upgrade.yaml | 12 ++---------
 jjb/netvirt/netvirt-csit-multi-openstack.yaml | 20 ++++++-------------
 jjb/netvirt/netvirt-patch-test.yaml           |  8 +-------
 4 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 08f38032d..c13362701 100644
--- 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"
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index f99457a1f..24b0e067d 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -90,25 +90,17 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-upgrade-openstack-integration-stein-silicon
+    name: netvirt-csit-upgrade-openstack-integration-stein-master
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
 
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
 
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-
     testplan: "{project}-{topology}-openstack-upgrade.txt"
     odl-ml2-driver-version: "v2"
     enable-openstack-services: "placement-api,l2gw-plugin"
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index f38f9f9fe..8f24005bb 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-silicon-rocky
+    name: netvirt-csit-openstack-integration-master-rocky
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -80,13 +80,13 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-openstack-integration-silicon-stein
+    name: netvirt-csit-openstack-integration-master-stein
     jobs:
       - inttest-csit-openstack-custom
     # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -323,7 +323,7 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-silicon
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-master
     jobs:
       - inttest-csit-openstack-custom
 
@@ -341,18 +341,10 @@
     os-cmp-cnt: 0
 
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           jre: "openjdk11"
 
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
-
-      - silicon:
-          branch: "stable/silicon"
-          jre: "openjdk11"
-
     topology:
       - 1node:
           openstack_system2_count: 0
diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 40e9cd764..0f2916d2f 100644
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -7,15 +7,9 @@
     project: "netvirt"
 
     stream:
-      - sulfur:
+      - master:
           branch: "master"
           java-version: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          java-version: "openjdk11"
-      - silicon:
-          branch: "stable/silicon"
-          java-version: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           java-version: "openjdk11"
-- 
2.36.6