From e1d909fcd52a0b9ef1a6c5a04ade17105b4748b8 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 1 Mar 2017 13:12:46 -0500 Subject: [PATCH] Fix yamllint for groupbasedpolicy Preparation for patch Icd1b8d4931e15b77ee29aa179422cd652e43f2e5 Change-Id: Ibe7755548efddb7c47d9799753509d394f807bba Signed-off-by: Thanh Ha --- ...groupbasedpolicy-csit-1node-openstack.yaml | 51 ++++++------ .../groupbasedpolicy-csit-3node.yaml | 30 +++---- .../groupbasedpolicy-csit-6node.yaml | 36 +++++---- .../groupbasedpolicy-csit-clustering.yaml | 34 ++++---- .../groupbasedpolicy-csit-sxp.yaml | 23 ++++-- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 80 +++++++++++-------- 6 files changed, 142 insertions(+), 112 deletions(-) diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 9b588ab3f..7a3c9a6e1 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -1,16 +1,17 @@ +--- - project: name: groupbasedpolicy-csit-openstack-integration jobs: - - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' + - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' # The project name project: 'groupbasedpolicy' topology: - - 1node: - openstack_system_count: 1 - odl_system_count: 1 - enable-haproxy: 'no' + - 1node: + openstack_system_count: 1 + odl_system_count: 1 + enable-haproxy: 'no' testplan: '{project}-{topology}-openstack.txt' @@ -18,28 +19,28 @@ functionality: 'openstack' stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf' + - carbon: + branch: 'master' + jre: 'openjdk8' + install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' + install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf' openstack: - - mitaka: - openstack-branch: 'stable/mitaka' - odl-ml2-branch: 'stable/mitaka' - odl-ml2-driver-version: 'v1' - - liberty: - openstack-branch: 'stable/liberty' - odl-ml2-branch: 'stable/liberty' - odl-ml2-driver-version: 'v1' + - mitaka: + openstack-branch: 'stable/mitaka' + odl-ml2-branch: 'stable/mitaka' + odl-ml2-driver-version: 'v1' + - liberty: + openstack-branch: 'stable/liberty' + odl-ml2-branch: 'stable/liberty' + odl-ml2-driver-version: 'v1' schedule: 'H H * * *' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 4a3a6a41e..e611d0fd7 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -1,8 +1,8 @@ +--- - project: name: groupbasedpolicy-csit-3node jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - + - '{project}-csit-1node-{functionality}-{install}-{stream}' # The project name project: 'groupbasedpolicy' @@ -12,21 +12,21 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # 3 Ubuntu VMs in JCloud configuration tools_system_count: 3 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 15d7d1131..f54fbb8f7 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -1,7 +1,8 @@ +--- - project: name: groupbasedpolicy-csit-6node jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - '{project}-csit-1node-{functionality}-{install}-{stream}' # The project name @@ -12,30 +13,31 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # 6 Ubuntu VMs in JCloud configuration tools_system_count: 6 tools_system_image: Ubuntu 14.04 - gbp - 20170210-0536 # Features to install - install-features: 'odl-groupbasedpolicy-ofoverlay, - odl-groupbasedpolicy-ui, - odl-restconf-all' + install-features: > + odl-groupbasedpolicy-ofoverlay, + odl-groupbasedpolicy-ui, + odl-restconf-all # Robot custom options robot-options: '' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index ac27097a9..6b386c0fc 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -1,7 +1,8 @@ +--- - project: name: groupbasedpolicy-csit-clustering jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - '{project}-csit-3node-{functionality}-{install}-{stream}' # The project name @@ -12,24 +13,27 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install - install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all' + install-features: > + odl-groupbasedpolicy-ofoverlay, + odl-groupbasedpolicy-ui, + odl-restconf-all # Robot custom options robot-options: '' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 16296a93d..970722602 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -1,8 +1,9 @@ +--- - project: name: groupbasedpolicy-csit-sxp jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - # The project name + - '{project}-csit-1node-{functionality}-{install}-{stream}' + # The project name project: 'groupbasedpolicy' # The functionality under test @@ -10,19 +11,25 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' + - carbon: + branch: 'master' + jre: 'openjdk8' install: - - only: - scope: 'only' + - only: + scope: 'only' # Mininet configuration (TOOLS) tools_system_count: 2 # Features to install - install-features: 'odl-restconf,odl-groupbasedpolicy-sxp-ise-adapter,odl-groupbasedpolicy-ne-location-provider,odl-groupbasedpolicy-ios-xe,odl-sfc-ios-xe-renderer,odl-sxp-controller' + install-features: > + odl-restconf, + odl-groupbasedpolicy-sxp-ise-adapter, + odl-groupbasedpolicy-ne-location-provider, + odl-groupbasedpolicy-ios-xe, + odl-sfc-ios-xe-renderer, + odl-sxp-controller # Robot custom options robot-options: '' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index da3fd917c..b0c69d622 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,12 +1,13 @@ +--- - project: name: groupbasedpolicy-carbon jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'groupbasedpolicy' @@ -14,26 +15,31 @@ branch: 'master' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean install findbugs:findbugs' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}' + dependencies: > + openflowjava-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream}, + sfc-merge-{stream}, + ovsdb-merge-{stream} email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' archive-artifacts: '' - project: name: groupbasedpolicy-boron jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: boron project: 'groupbasedpolicy' @@ -41,26 +47,31 @@ branch: 'stable/boron' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean install findbugs:findbugs' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}' + dependencies: > + openflowjava-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream}, + sfc-merge-{stream}, + ovsdb-merge-{stream} email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' archive-artifacts: '' - project: name: groupbasedpolicy-beryllium jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: beryllium project: 'groupbasedpolicy' @@ -68,22 +79,27 @@ branch: 'stable/beryllium' jdk: openjdk7 jdks: - - openjdk7 - - openjdk8 + - openjdk7 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean install findbugs:findbugs' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}' + dependencies: > + openflowjava-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream}, + sfc-merge-{stream}, + ovsdb-merge-{stream} email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' archive-artifacts: '' - project: name: groupbasedpolicy-sonar jobs: - - '{project-name}-sonar' + - '{project-name}-sonar' project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'master' -- 2.36.6