Include Beryllium job for distribution userfeatures tests

+ List of triggering jobs improved.

Change-Id: I2d391d5ab3019eeaaef9653145dc57e3885bbd08
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 745e7ff0645bd44ffb30cf4d1982a22a4afa4ebf..d59a67ebc6180f883f503383ce3fe6e1cbe13796 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -17,6 +17,9 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     # TODO: Add Beryllium when everything is backported there.
 
@@ -34,6 +37,5 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: >
-        odlparent-distribution-{stream},
         controller-distribution-{stream},
-        netconf-distribution-{stream}
+        integration-distribution-merge-{stream}