From 623ed1ab7450b25192bb9d61a47ee2aad9bb4c54 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Fri, 19 Dec 2014 16:35:25 -0600 Subject: [PATCH] Add dependencies to openflowplugin jobs Change-Id: I4ea13b19a9e9cc50cc9f7dcbd86eac0465dc8c07 Signed-off-by: Ed Warnicke --- jjb/openflowplugin/openflowplugin.cfg | 1 + jjb/openflowplugin/openflowplugin.yaml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg index 7898fb5da1..1fc78639aa 100644 --- a/jjb/openflowplugin/openflowplugin.cfg +++ b/jjb/openflowplugin/openflowplugin.cfg @@ -1,2 +1,3 @@ MVN_GOALS: -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install javadoc:aggregate #MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m +DEPENDENCIES: yangtools,controller,openflowjava diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 051ba31e30..8867c67632 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -196,7 +196,7 @@ - job-template: name: 'openflowplugin-integration-{stream}' - disabled: true + disabled: false # Job template for ODL merge jobs # @@ -233,7 +233,7 @@ triggers: - reverse: - jobs: '' + jobs: 'yangtools-merge,controller-merge,openflowjava-merge' result: 'success' maven: @@ -246,4 +246,4 @@ publishers: - email-notification: - email-prefix: '[openflowplugin]' + email-prefix: '[openflowplugin] [yangtools] [controller] [openflowjava]' -- 2.36.6