Fix neutron job config

Neutron is self-managed since Phosphorus, hence does not have a
stability branch. Fix that. Also remove triggers from odlparent/aaa, as
those are release-integrated anyway.

Change-Id: Ic3caeb88f104c4192d81480015b42a08293cfa9c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index c001f8b7f1fbc04059616e1243c2d65c22d4d4c8..6f5e657ce32c7884eda44cc06be46dced960f2e6 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -10,11 +10,10 @@
     project: "neutron"
     project-name: "neutron"
     build-timeout: 90
-    branch: "stable/phosphorus"
+    branch: "master"
     java-version: "openjdk11"
     mvn-settings: "neutron-settings"
     mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},aaa-merge-{stream}"
     email-upstream: "[neutron] [odlparent] [aaa]"
 
     # Used by the release job