From d4734b8f3cc982e5d7bdb653f630a3a5d4b1313c Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Mon, 21 Sep 2015 18:47:33 -0700 Subject: [PATCH] Remove AD-SAL test from Beryllium (master) test Remove AD-SAL features installation from master Add -e adsal for those tests including AD-SAL checks Change-Id: Ic23e9ec3390b861a84af64ed70fd53ea942ad66b Signed-off-by: Luis Gomez --- .../openflowplugin-csit-clustering.yaml | 2 +- ...owplugin-csit-flow-services-beryllium.yaml | 31 +++++++++++++++++++ ...lowplugin-csit-flow-services-lithium.yaml} | 4 +-- ...t-flow-services-more-lithium-redesign.yaml | 2 +- ...penflowplugin-csit-flow-services-more.yaml | 2 +- 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml rename jjb/openflowplugin/{openflowplugin-csit-flow-services.yaml => openflowplugin-csit-flow-services-lithium.yaml} (90%) diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 478c942a9..846de68dd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -19,7 +19,7 @@ scope: 'only' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all' + install-features: 'odl-openflowplugin-flow-services-ui' # Robot custom options robot-options: '' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml new file mode 100644 index 000000000..43a6de28f --- /dev/null +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml @@ -0,0 +1,31 @@ +- project: + name: openflowplugin-csit-flow-services-beryllium + jobs: + - '{project}-csit-1node-{functionality}-{install}-{stream}' + - '{project}-csit-verify-1node-{functionality}-{stream}' + + # The project name + project: 'openflowplugin' + + # The functionality under test + functionality: 'flow-services' + + # Project branches + stream: + - beryllium: + branch: 'master' + + install: + - only: + scope: 'only' + - all: + scope: 'all' + + # Features to install + install-features: 'odl-openflowplugin-flow-services-ui' + + # Robot custom options + robot-options: '-e adsal' + + # Trigger jobs (upstream dependencies) + trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml similarity index 90% rename from jjb/openflowplugin/openflowplugin-csit-flow-services.yaml rename to jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml index 6eb00a186..5c60f3874 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml @@ -1,5 +1,5 @@ - project: - name: openflowplugin-csit-flow-services + name: openflowplugin-csit-flow-services-lithium jobs: - '{project}-csit-1node-{functionality}-{install}-{stream}' - '{project}-csit-verify-1node-{functionality}-{stream}' @@ -12,8 +12,6 @@ # Project branches stream: - - beryllium: - branch: 'master' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml index e208b1504..d22bb0a60 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more-lithium-redesign.yaml @@ -24,7 +24,7 @@ install-features: 'odl-openflowplugin-flow-services-ui-li' # Robot custom options - robot-options: '-e adsal' + robot-options: '' # Trigger jobs (upstream dependencies) trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml index 9db1756bb..a71b8ebe5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml @@ -24,7 +24,7 @@ scope: 'all' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all' + install-features: 'odl-openflowplugin-flow-services-ui' # Robot custom options robot-options: '' -- 2.36.6