Feat: Add branch stable/phosphorus

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

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 3e79e321f4d9bc37a1cc5edbcdcfccbbe1a82bca..f38f9f9fe24e31f511cd7ede4794b8ec3d4ca72f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -51,7 +51,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -83,7 +83,7 @@
     name: netvirt-csit-openstack-integration-silicon-stein
     jobs:
       - inttest-csit-openstack-custom
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
     stream: "silicon"
@@ -132,7 +132,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -212,7 +212,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -245,7 +245,7 @@
     jobs:
       - inttest-csit-openstack-custom
 
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
     stream: "aluminium"
@@ -294,7 +294,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
@@ -327,7 +327,7 @@
     jobs:
       - inttest-csit-openstack-custom
 
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
@@ -341,10 +341,14 @@
     os-cmp-cnt: 0
 
     stream:
-      - phosphorus:
+      - sulfur:
           branch: "master"
           jre: "openjdk11"
 
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+
       - silicon:
           branch: "stable/silicon"
           jre: "openjdk11"
@@ -379,7 +383,7 @@
           testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
           enable-gre-type-driver: "yes"
-        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: "{project}-{topology}-tdd-wip-openstack.txt"
       - tempest-stateful: