Merge "Push OpFlex artifacts to Nexus repository."

[releng/builder.git] / jjb / netvirt / netvirt-patch-test.yaml

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index d726c0fbaac5d334395973a7f233ed46b14815f4..f2037e97607a100ae9fe33249dc9609a24bb904d 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -9,50 +9,74 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jdk: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jdk: 'openjdk8'
-
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jdk: 'openjdk8'
+          karaf-version: karaf3
 
     feature:
-      - legacy:
-          csit-list: >
-              netvirt-legacy-csit-1node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-1node-openstack-basic-only-{stream}
       - current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
       - minimal-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-minimal-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-minimal-stateful-{stream}
       - tempest-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-tempest-stateful-{stream}
-      - cluster-legacy:
-          csit-list: >
-              netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream},
-              netvirt-legacy-csit-3node-clustering-only-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-tempest-stateful-{stream}
       - cluster-current:
           csit-list: >
-              netvirt-csit-3node-openstack-newton-nodl-v2-gate-stateful-{stream}
-      - mitaka-current:
-          csit-list: >
-              netvirt-csit-1node-openstack-mitaka-gate-stateful-{stream}
+              netvirt-csit-3node-openstack-ocata-gate-stateful-{stream}
       - nodl-v1-current:
           csit-list: >
               netvirt-csit-1node-openstack-newton-gate-stateful-{stream}
       - learn-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-learn-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-learn-{stream}
       - stateful-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-stateful-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
       - transparent-current:
           csit-list: >
-              netvirt-csit-1node-openstack-newton-nodl-v2-gate-transparent-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-transparent-{stream}
+      - snat-conntrack:
+          csit-list: >
+              netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-{stream}
+      - hwvtep:
+          csit-list: >
+              netvirt-csit-hwvtep-1node-openstack-ocata-gate-stateful-{stream}
+
+- project:
+    name: netvirt-legacy-patch-test
+    jobs:
+      - '{project}-patch-test-{feature}-{stream}'
+
+    # The project name
+    project: 'netvirt-legacy'
+
+    # Project branches
+    stream:
+      - boron:
+          branch: 'stable/boron'
+          jdk: 'openjdk8'
+          karaf-version: karaf3
+
+    feature:
+      - legacy:
+          csit-list: >
+              netvirt-legacy-csit-1node-openstack-newton-nodl-v2-gate-{stream},
+              netvirt-legacy-csit-1node-openstack-basic-only-{stream}
+      - cluster-legacy:
+          csit-list: >
+              netvirt-legacy-csit-3node-openstack-newton-nodl-v2-gate-{stream},
+              netvirt-legacy-csit-3node-clustering-only-{stream}