Merge "Remove Lithium 3node -all- job from csit-list"

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
new file mode 100644 (file)
index 0000000..e4be413
--- /dev/null
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -0,0 +1,32 @@
+- project:
+    name: alto-csit-setup
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'alto'
+
+    # The functionality under test
+    functionality: 'setup'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-alto-resourcepool,odl-restconf-all'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'odlparent-distribution-{stream}, yangtools-distribution-{stream}, controller-distribution-{stream}, aaa-distribution-{stream}, integration-distribution-merge-{stream}, alto-distribution-{stream}'

diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg
index 3f92fda089af78520e2919b4b25f62af8a95effe..f95ff82e3690ed540e3389465a50739885f2ec35 100644 (file)
--- a/jjb/capwap/capwap.cfg
+++ b/jjb/capwap/capwap.cfg
@@ -5,7 +5,6 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
-    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 4770fa59cdc025b3c5a81abb883d0823603b5d97..c1871c7466a4c2e1a819c19e592b423b37cd80fe 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -32,7 +32,7 @@
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7

diff --git a/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
new file mode 100644 (file)
index 0000000..96dca8a
--- /dev/null
+++ b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
@@ -0,0 +1,10 @@
+# Make sure changes merged after patch creation are applied.
+
+set -exu
+echo "Rebase the patch on top of ${GERRIT_PROJECT}"
+cd "${GERRIT_PROJECT}"
+export EMAIL="sandbox@jenkins.opendaylight.org"
+# TODO: Is there a more appropriate e-mail?
+export GIT_COMMITTER_NAME="Rebase Macro"
+git rebase "origin/${BRANCH}"
+cd "${WORKSPACE}"

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index d3b0ce2552d6606e9b30ad9dfef9c7e38afcc29d..8775f275217b71832ef0d13f0a66d39f48b0c6bb 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -326,6 +326,16 @@
             !include-raw:
                 - include-raw-integration-cleanup-workspace.sh
 
+# Macro: integration-rebase-patch
+# Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH.
+# Used by: integration-patch-distribution-* job template
+
+- builder:
+    name: integration-rebase-gerrit-patch
+    builders:
+        - shell:
+            !include-raw include-raw-integration-rebase-gerrit-patch.sh
+
 ##############
 # Publishers #
 ##############

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index e30244c4243f27659cc94c9cd3705af040ab6faf..89b6ddfd5152ccb2918d6c7ae7e80914d3d2f2c8 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -320,6 +320,8 @@
             refspec: '$GERRIT_REFSPEC'
         - project-parameter:
             project: '$GERRIT_PROJECT'
+        - integration-branch:
+            branch: '{branch}'
         - integration-distribution-git-url
 
     scm:
@@ -357,6 +359,7 @@
                 notbuilt: true
 
     prebuilders:
+        - integration-rebase-gerrit-patch
         - integration-get-bundle-url
         - inject:
             properties-file: 'bundle.txt'

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 47b563351b89c98976f09c3c7ba610d9a1651097..864a1fe74b62476971092f0ae99b4d9987cd5b7e 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,13 +1,7 @@
 STREAMS:
-- clustering-netvirt-lithium:
-    branch: topic/lithium/net-virt-clustering
-    jdks: openjdk7
 - clustering-netvirt-master:
     branch: topic/master/net-virt-clustering
     jdks: openjdk7
-- neutron-yang-migration:
-    branch: topic/master/neutron-yang-migration
-    jdks: openjdk7
 - routermanager:
     branch: topic/routermanager
     jdks: openjdk7

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 742fb325da71e52b94094d10d9d341be2c9dac29..53db275b2821ebcd6f3a8062b12cbe9679e98df4 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -221,8 +221,7 @@
     builders:
         - sonatype-clm:
             application-name: '{application-name}'
-            scan-targets: '**/target/**'
-            module-excludes: '**/target/pax/**,**/target/assembly/**'
+            module-excludes: '**/karaf/target/**'
 
 - builder:
     name: releng-check-unicode