Add nitrogen jobs for daexim

daexim is now part of SR therefore it requires standard build jobs
and standard csit jobs for nitrogen (master branch).

Change-Id: I267d6cb6fc2ff3b9868184b3fc3c07c93705aaad
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index 2330af7b7c285cb5ab7fbb894e4804ebd284b35f..98cca2f71a5b5cfbc5b69f2734b81ecb2f66c046 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -10,17 +10,11 @@
     # The functionality under test
     functionality: 'basic'
 
-    # Set trigger
-    trigger-jobs: '{project}-merge-{stream}'
-
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
-          karaf-version: karaf3
-          # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/daexim/job/daexim-merge-carbon/lastSuccessfulBuild/org.opendaylight.daexim$daexim-karaf/artifact/org.opendaylight.daexim/daexim-karaf/1.0.0-SNAPSHOT/daexim-karaf-1.0.0-SNAPSHOT.zip'
 
     install:
       - only:

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 6fb143be4640119d18cb482204aa21b65de09eb5..0f09cfa562807807bda5d4fcdbf6807ff732b392 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,17 +1,17 @@
 ---
 - project:
-    name: daexim-carbon
+    name: daexim-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: carbon
+    stream: nitrogen
     branch: 'master'
-    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -19,7 +19,7 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
@@ -34,5 +34,5 @@
     project-name: 'daexim'
     branch: 'master'
     mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'