Merge "Handle yangtools nitrogen non-standard branch"

diff --git a/jjb/autorelease/validate-autorelease-nitrogen.yaml b/jjb/autorelease/validate-autorelease-nitrogen.yaml
index b6efed418cefb691699d0d22778c737485815320..4b4e3a1b31d5a0d5fbc36ff0b2dddc74ed7f3a07 100644 (file)
--- a/jjb/autorelease/validate-autorelease-nitrogen.yaml
+++ b/jjb/autorelease/validate-autorelease-nitrogen.yaml
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-validate-autorelease-{stream}'
     stream: nitrogen
-    branch: master
+    branch: stable/nitrogen
     project-name:
       - aaa:
           project: aaa

diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml
new file mode 100644 (file)
index 0000000..f45d0a3
--- /dev/null
+++ b/jjb/autorelease/validate-autorelease-oxygen.yaml
@@ -0,0 +1,87 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-oxygen
+    jobs:
+      - '{project-name}-validate-autorelease-{stream}'
+    stream: oxygen
+    branch: master
+    project-name:
+      - aaa:
+          project: aaa
+      - alto:
+          project: alto
+      - bgpcep:
+          project: bgpcep
+      - bier:
+          project: bier
+      - cardinal:
+          project: cardinal
+      - controller:
+          project: controller
+      - coe:
+          project: coe
+      - daexim:
+          project: daexim
+      - dlux:
+          project: dlux
+      - dluxapps:
+          project: dluxapps
+      - eman:
+          project: eman
+      - genius:
+          project: genius
+      - groupbasedpolicy:
+          project: groupbasedpolicy
+      - honeycomb-vbd:
+          project: honeycomb/vbd
+      - infrautils:
+          project: infrautils
+      - integration-distribution:
+          project: integration/distribution
+      - l2switch:
+          project: l2switch
+      - lispflowmapping:
+          project: lispflowmapping
+      - mdsal:
+          project: mdsal
+      - nemo:
+          project: nemo
+      - netconf:
+          project: netconf
+      - netvirt:
+          project: netvirt
+      - neutron:
+          project: neutron
+      - nic:
+          project: nic
+      - ocpplugin:
+          project: ocpplugin
+      - of-config:
+          project: of-config
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - packetcable:
+          project: packetcable
+      - sfc:
+          project: sfc
+      - snmp:
+          project: snmp
+      - snmp4sdn:
+          project: snmp4sdn
+      - sxp:
+          project: sxp
+      - topoprocessing:
+          project: topoprocessing
+      - ttp:
+          project: ttp
+      - unimgr:
+          project: unimgr
+      - usc:
+          project: usc
+      - vtn:
+          project: vtn
+      - yangtools:
+          project: yangtools

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index a69f1cdb2819adec92f356b74ff0f269f9dff3b7..d07b4cb1c9aabe043a8ab2544895ad41f1eae3fd 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -321,17 +321,9 @@
         netvirt-csit-3node-openstack-ocata-upstream-stateful-oxygen,
         netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-oxygen,
         netvirt-csit-3node-openstack-ocata-upstream-transparent-oxygen,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-oxygen,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-oxygen,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-oxygen,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-oxygen,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-oxygen,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-oxygen,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-oxygen,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-oxygen,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-oxygen,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-oxygen,
         nic-csit-1node-basic-all-oxygen,
         nic-csit-1node-basic-only-oxygen,
@@ -521,17 +513,9 @@
         netvirt-csit-3node-openstack-ocata-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-ocata-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-nitrogen,
         nic-csit-1node-basic-all-nitrogen,
         nic-csit-1node-basic-only-nitrogen,
@@ -721,17 +705,9 @@
         netvirt-csit-3node-openstack-ocata-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-ocata-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-carbon,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
         nic-csit-1node-basic-all-carbon,
         nic-csit-1node-basic-only-carbon,
@@ -907,17 +883,9 @@
         netvirt-csit-3node-openstack-ocata-upstream-stateful-boron,
         netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-ocata-upstream-transparent-boron,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
-        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-boron,
-        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-boron,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-boron,
-        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-boron,
-        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-boron,
         netvirt-legacy-csit-1node-openstack-basic-all-boron,
         netvirt-legacy-csit-1node-openstack-basic-only-boron,