Merge "Adding sshpass to centos after new karaf upgrade"

diff --git a/jenkins-scripts/controller.sh b/jenkins-scripts/controller.sh
index 7d8f27fe21b2f9d191a7ff8bb5a9e495ef1a3eea..fe4611f8e9ee251d7649d86da0c417b4764b36b1 100755 (executable)
--- a/jenkins-scripts/controller.sh
+++ b/jenkins-scripts/controller.sh
@@ -7,3 +7,8 @@ service iptables stop
 yum install -y sshpass
 
 # vim: sw=2 ts=2 sts=2 et :
+
+cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: /sbin/iptables
+EOF

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index 4d9ea466acfd6611a853b15574a93a4770d70901..633f5570c40a4664b27d23ad713d0495a7831764 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -1,16 +1,11 @@
 # Lithium build jobs
 
 - project:
-    name: autorelease
+    name: autorelease-lithium
     jobs:
         - 'autorelease-daily-lithium'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
-    stream:
-        - master:
-            branch: 'master'
-
+    branch: 'stable/lithium'
     project: 'releng/autorelease'
     jdk: 'openjdk7'
 
@@ -39,7 +34,7 @@
             url: '$GIT_BASE'
             refspec: ''
             branches:
-                - 'origin/master'
+                - 'origin/{branch}'
             skip-tag: true
             recursive-submodules: true
 
@@ -76,6 +71,6 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'sources.log'
+            artifacts: 'sources.log,patches/*.patch'
         - email-notification:
             email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
new file mode 100644 (file)
index 0000000..2e0c1f6
--- /dev/null
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -0,0 +1,76 @@
+# Lithium build jobs
+
+- project:
+    name: autorelease-master
+    jobs:
+        - 'autorelease-daily-master'
+
+    branch: 'master'
+    project: 'releng/autorelease'
+    jdk: 'openjdk7'
+
+- job-template:
+    name: 'autorelease-daily-master'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - autorelease-release-tag:
+            release-tag: 'Daily'
+
+    scm:
+        - git:
+            credentials-id: '{ssh-credentials}'
+            url: '$GIT_BASE'
+            refspec: ''
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            recursive-submodules: true
+
+    wrappers:
+        - autorelease-build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H 0 * * *'
+
+    prebuilders:
+        - shell:
+            !include-raw-escape include-raw-autorelease-release-versions.sh
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'clean install source:jar javadoc:jar -Pintegrationtests,docs,repoBuild -fae -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        settings: '{autorelease-settings}'
+        global-settings: '{odl-global-settings}'
+
+    postbuilders:
+        - maven-target:
+            maven-version: '{mvn32}'
+            pom: 'pom.xml'
+            goals: 'dependency:sources -l sources.log -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+                - '-Xmx4096m -XX:MaxPermSize=1024m'
+            settings: '{autorelease-settings}'
+            global-settings: '{odl-global-settings}'
+        - jacoco-nojava-workaround
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'sources.log,patches/*.patch'
+        - email-notification:
+            email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index b61248407a37542028b41effd2e5ad098e285c58..af35ac0dafeac90979dcdbfd67a2f7318777930f 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -14,6 +14,9 @@
 ./scripts/version.sh release $RELEASE_TAG
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
-git submodule foreach "git format-patch --stdout origin/master > ../patches/${PWD##*/}.patch"
+
+mkdir patches
+git submodule foreach 'git format-patch --stdout origin/master > ../patches/$name.patch'
 
 ./scripts/fix-relativepaths.sh
+

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
index eb103746790dc0129ab96123b08f12b63c69bef8..04211c7eeb84cbb1e42e6d72008173b28c3a7c69 100644 (file)
--- a/jjb/controller/controller.cfg
+++ b/jjb/controller/controller.cfg
@@ -1,3 +1,4 @@
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs
 MVN_OPTS: -Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: yangtools,aaa
+JDKS: openjdk7,openjdk8

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 715009bb6846cc3b6f55a69e12e170dc92139d4a..bfcd07c9a29babec22774d95857b3de3ed3de576 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -54,6 +54,7 @@
             type: jdk
             values:
                 - openjdk7
+                - openjdk8
 
 
     logrotate:

diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index 0848d0376c500d473f659b1b215d4c9a5a3f2313..1d484179458fc7e7ef4fc64a4b7527d25b6b2903 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -67,7 +67,8 @@ echo "sleeping for 20 seconds..."
 sleep 20
 
 echo "Check OSGi bundles..."
-./client "feature:install ${CONTROLLERFEATURES}" || echo $? > ${WORKSPACE}/error.txt
+# Remove until we get sshpass in rackspace
+#./client "feature:install ${CONTROLLERFEATURES}" || echo $? > ${WORKSPACE}/error.txt
 
 echo "Fetching Karaf log"
 cd ${WORKSPACE}

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 9210b45be3f25b5590e080fcef6f75326bd5cfa6..38b3d9844e050c8adcfd86701fbcfe5759b52545 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -88,7 +88,8 @@ echo "Cool down for 1 min :)..."
 sleep 60
 
 echo "Checking OSGi bundles..."
-./client 'bundle:list'
+# Remove until we get sshpass in rackspace
+#./client 'bundle:list'
 
 EOF
 

diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml
index 93093df1394688f2a124458dde4573854efc3e58..3d6fe8aaa25bc789803915d3e9fbbb45abe80b77 100644 (file)
--- a/jjb/integration/integration-jobs.yaml
+++ b/jjb/integration/integration-jobs.yaml
@@ -277,12 +277,7 @@
     parameters:
         - project-parameter:
             project: 'integration'
-        - integration-patch-git:
-            patch-git: ''
-        - integration-patch-refspec:
-            patch-refspec: ''
-        - integration-patch-git-url:
-            patch-git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$PATCHGIT'
+        - integration-patch-git-url
 
     scm:
         - integration-gerrit-scm:
@@ -297,6 +292,24 @@
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-integration'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '**'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
     prebuilders:
         - integration-get-bundle-url
         - inject:
@@ -304,7 +317,7 @@
         - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn32}'
-            pom: '$PATCHGIT/pom.xml'
+            pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index ab6fe55f10669f5b24f9eba03b8fb0aed1eb597e..bbf9fe7992e983f9ddafc594aba1b8520ba2f69f 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -46,38 +46,22 @@
             default: '{test-options}'
             description:  'Robot command options'
 
-- parameter:
-    name: integration-patch-git
-    parameters:
-        - string:
-            name: PATCHGIT
-            default: '{patch-git}'
-            description:  'Patch GIT repository'
-
 - parameter:
     name: integration-patch-git-url
     parameters:
         - string:
             name: PATCHGITURL
-            default: '{patch-git-url}'
+            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT'
             description:  'Patch GIT URL (do not modify)'
 
-- parameter:
-    name: integration-patch-refspec
-    parameters:
-        - string:
-            name: PATCHREFSPEC
-            default: '{patch-refspec}'
-            description:  'Patch Refspec'
-
 - scm:
     name: integration-gerrit-scm
     scm:
         - git:
             credentials-id: '{credentials-id}'
             url: '$PATCHGITURL'
-            basedir: '$PATCHGIT'
-            refspec: '$PATCHREFSPEC'
+            basedir: '$GERRIT_PROJECT'
+            refspec: '$GERRIT_REFSPEC'
             branches:
                 - 'origin/{branch}'
             skip-tag: true

diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
new file mode 100644 (file)
index 0000000..51d8795
--- /dev/null
+++ b/jjb/odlparent/odlparent.cfg
@@ -0,0 +1 @@
+BRANCHES: master,stable/helium,stable/lithium

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index b4a3ce215c7aaf33235a8474203241e70540671b..c821289042274788fe04258c30651490cd3669fc 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -20,6 +20,8 @@
             branch: 'master'
         - stable-helium:
             branch: 'stable/helium'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     project: 'odlparent'
     jdk: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
new file mode 100644 (file)
index 0000000..2800f26
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
@@ -0,0 +1,28 @@
+- project:
+    name: openflowplugin-csit-flow-services-lithium-redesign
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'flow-services-lithium-redesign'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-app-new-lldp-speaker'
+
+    # Robot custom options
+    robot-options: '-v TOPO_TREE_DEPTH:5 -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.cfg b/jjb/openflowplugin/openflowplugin.cfg
index 7ce0bc83c6a11f419b082568757aa762432c355c..27bcd728daaf26c86c9cee70c82e8d31a4b04892 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -2,3 +2,4 @@ MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tm
 #MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: yangtools,controller,openflowjava
 ARCHIVE_ARTIFACTS: model/*/target/site/**
+JDKS: openjdk7,openjdk8

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 129f00eb37173f19dc7aed7baa6fda8b5ac457ef..36bdaf4a7c8674bd352972d91a5953fe719a64fd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -54,6 +54,7 @@
             type: jdk
             values:
                 - openjdk7
+                - openjdk8
 
 
     logrotate: