From b7d0c990a2a23a0e040949027f693640acb68c3e Mon Sep 17 00:00:00 2001 From: Sreekalyan Devaraj Date: Tue, 7 Mar 2017 18:57:31 -0800 Subject: [PATCH] Add Boron branch and csit jobs for jsonrpc Change-Id: I2d61fa52846e5ff2b0aa7471f5d39e1fa3d33b41 Signed-off-by: Sreekalyan Devaraj --- jjb/jsonrpc/jsonrpc-csit-basic.yaml | 50 +++++++++++++++++++++++++++++ jjb/jsonrpc/jsonrpc.yaml | 28 ++++++++++++++++ jjb/releng-defaults.yaml | 2 +- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 jjb/jsonrpc/jsonrpc-csit-basic.yaml diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml new file mode 100644 index 000000000..07dabe4d7 --- /dev/null +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -0,0 +1,50 @@ +--- +- project: + name: jsonrpc-csit-basic + jobs: + - '{project}-csit-1node-{functionality}-{install}-{stream}' + + # The project name + project: 'jsonrpc' + + # The functionality under test + functionality: 'basic' + + # Set trigger + trigger-jobs: '{project}-merge-{stream}' + + # Project branches + stream: + - nitrogen: + branch: 'master' + jre: 'openjdk8' + karaf-version: karaf3 + # yamllint disable-line rule:line-length + bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip' + + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' + karaf-version: karaf3 + # yamllint disable-line rule:line-length + bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip' + + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + karaf-version: karaf3 + # yamllint disable-line rule:line-length + bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-boron/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/0.9.0-SNAPSHOT/jsonrpc-karaf-0.9.0-SNAPSHOT.zip' + + install: + - only: + scope: 'only' + + # no mininet required + tools_system_count: 0 + + # Features to install + install-features: 'odl-jsonrpc' + + # Robot custom options + robot-options: '' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 169577e4e..807e49837 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -6,6 +6,7 @@ - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' + project: 'jsonrpc' project-name: 'jsonrpc' stream: nitrogen @@ -30,6 +31,7 @@ - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' + project: 'jsonrpc' project-name: 'jsonrpc' stream: carbon @@ -48,6 +50,32 @@ email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' archive-artifacts: '' +- project: + name: jsonrpc-boron + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + project: 'jsonrpc' + project-name: 'jsonrpc' + stream: boron + branch: 'stable/boron' + karaf-version: karaf3 + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'jsonrpc-settings' + mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' + email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' + archive-artifacts: '' + - project: name: jsonrpc-sonar jobs: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 54ae11bbc..53a6ba62c 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -191,7 +191,7 @@ # CSIT Test List Variables # Space seperated strings to exclude from # auto generated CSIT job lists - csit-list-blacklist: 'longevity gate sanity daexim' + csit-list-blacklist: 'longevity gate sanity daexim jsonrpc' # Auto Generated CSIT job lists used # in regular distribution test jobs -- 2.36.6