Merge "Set GERRIT_REFSPEC defaults for Gerrit Trigger jobs"

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index afcfe9a3a95884d5032aff8c917dcde456237845..26f80b4012b62bfea0ecc93ee2f1ff8c011d1a14 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -28,7 +28,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'PROJECT_PATH'
 

diff --git a/jjb-templates/validate-autorelease.yaml b/jjb-templates/validate-autorelease.yaml
index 8ebc14e46bfaf89ceed3ead0fc6de4cd697232c0..6f014a45fcf68b6aa5b50a407ee494db436a5938 100644 (file)
--- a/jjb-templates/validate-autorelease.yaml
+++ b/jjb-templates/validate-autorelease.yaml
@@ -42,9 +42,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'PROJECT_PATH'
-            branch: '{branch}'
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'PROJECT_PATH'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index bbf90e22614231696a4b21a06d11de19955630ac..99c40872a5be5d4091caea858ef52d3fcf71788b 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -13,6 +13,9 @@
 # RELEASE_TAG=Helium-SR2  # Example
 # RELEASE_BRANCH=stable/helium  # Example
 
+# Directory to put git format-patches
+PATCH_DIR=`pwd`/patches
+
 if [ "$DATESTAMP" == "true" ]; then
    export RELEASE_TAG=$RELEASE_TAG-`date -u +v%Y%m%d%H%M`
 fi
@@ -25,9 +28,9 @@ git commit -am "Release $RELEASE_TAG"
 mkdir patches
 modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
 for module in $modules; do
-    cd $module
-    git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$module.patch
-    cd ..
+    pushd $module
+    git format-patch --stdout origin/$RELEASE_BRANCH > $PATCH_DIR/${module//\//-}.patch
+    popd
 done
 
 ./scripts/fix-relativepaths.sh

diff --git a/jjb/integration/include-raw-integration-get-slave-addresses.sh b/jjb/integration/include-raw-integration-get-slave-addresses.sh
index 804e10db73fa5f3be54c341d785351d5d11e567e..e498baab120d4d4fe564d0d643936c4cd4cc3908 100644 (file)
--- a/jjb/integration/include-raw-integration-get-slave-addresses.sh
+++ b/jjb/integration/include-raw-integration-get-slave-addresses.sh
@@ -8,7 +8,7 @@ IFS=',' read -ra ADDR <<< "${JCLOUDS_IPS}"
 for i in "${ADDR[@]}"
 do
     REMHOST=`ssh ${i} hostname`
-    if [ `echo ${REMHOST} | grep java` ]; then
+    if [ `echo ${REMHOST} | grep 'java\|devstack'` ]; then
         ODL_SYSTEM=( "${ODL_SYSTEM[@]}" "${i}" )
     else
         TOOLS_SYSTEM=( "${TOOLS_SYSTEM[@]}" "${i}" )

diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml
index 9b536415f22fd83d01a83978b950553272f6a90f..23f3202acdac99f0fee6bfe35b889154a3860bfd 100644 (file)
--- a/jjb/netide/netide-csit-basic.yaml
+++ b/jjb/netide/netide-csit-basic.yaml
@@ -2,6 +2,7 @@
     name: netide-csit-basic
     jobs:
         - '{project}-csit-verify-1node-{functionality}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'netide'

diff --git a/jjb/ovsdb/ovsdb-openstack-tempest.yaml b/jjb/ovsdb/ovsdb-openstack-tempest.yaml
new file mode 100644 (file)
index 0000000..89036b8
--- /dev/null
+++ b/jjb/ovsdb/ovsdb-openstack-tempest.yaml
@@ -0,0 +1,93 @@
+- project:
+    name: ovsdb-openstack-tempest
+    jobs:
+        - 'ovsdb-openstack-tempest-{openstack}-{odl}'
+
+    openstack:
+        - mitaka:
+            openstack-branch: 'master'
+        - liberty:
+            openstack-branch: 'stable/liberty'
+    # can add kilo if it's needed, but would result in two more hour long jobs
+
+    odl:
+        - beryllium:
+            odl-version: 'beryllium'
+        - lithium:
+            odl-version: 'lithium'
+
+- job-template:
+    name: 'ovsdb-openstack-tempest-{openstack}-{odl}'
+
+    project-type: freestyle
+    node: dynamic_robot
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration/test'
+        - integration-patch-refspec:
+            branch: 'master'
+        - string:
+            name: OPENSTACK_BRANCH
+            default: '{openstack-branch}'
+            description: 'Openstack branch to use with devstack'
+        - string:
+            name: ODL_VERSION
+            default: '{odl-version}'
+            description: 'OpenDaylight version to use with devstack + networking_odl project'
+        - string:
+            name: TEMPEST_REGEX
+            default: 'tempest.api.network'
+            description: 'Default grouping of tempest tests to run'
+
+    scm:
+        - integration-gerrit-scm:
+            credentials-id: '{ssh-credentials}'
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
+            branch: 'master'
+
+    wrappers:
+          - build-timeout
+          - jclouds:
+              instances:
+                - rk-c7-devstack:
+                    cloud-name: 'Rackspace DFW - Devstack'
+                    count: '1'
+                    stop-on-terminate: False
+          - ssh-agent-credentials:
+              users:
+                  - '{ssh-credentials}'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    builders:
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
+        - integration-get-slave-addresses
+        - inject:
+            properties-file: 'slave_addresses.txt'
+        - shell: 'pybot -e exclude -v WORKSPACE:/tmp -v USER_HOME:$HOME -L TRACE -v DEVSTACK_SYSTEM_USER:$USER
+                        -v DEVSTACK_SYSTEM_IP:$ODL_SYSTEM_IP -v DEFAULT_LINUX_PROMPT:\]\>
+                        -v OPENSTACK_BRANCH:$OPENSTACK_BRANCH -v ODL_VERSION:$ODL_VERSION
+                        -v TEMPEST_REGEX:$TEMPEST_REGEX $WORKSPACE/test/csit/suites/ovsdb/Devstack_Tempest_Tests/
+                        || true'
+        - shell: 'scp $ODL_SYSTEM_IP:/opt/stack/logs/devstacklog.txt $WORKSPACE/'
+        - integration-cleanup-tmp
+
+    publishers:
+        - integration-robot:
+            unstable-if: 0.0
+            pass-if: 100.0
+        - archive:
+            artifacts: 'devstacklog.txt'
+        - email-notification:
+            email-prefix: '[ovsdb]'

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 0754733852980e004804b3bed21cdd9fdfdd3f09..4dab955d050db602e16d2a8276486e58dfee30c2 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -17,6 +17,8 @@
             mvnver: '{mvn33}'
 
     stream:
+        - pre-boron:
+            branch: pre-boron
         - beryllium:
             branch: master
 

diff --git a/src/site/markdown/jenkins.markdown b/src/site/markdown/jenkins.markdown
index 12e136f229473e7bf26a0d925f1f1f6922407993..68f2152c49b0d1b19cba801cf77c4b8566ccf197 100644 (file)
--- a/src/site/markdown/jenkins.markdown
+++ b/src/site/markdown/jenkins.markdown
@@ -422,6 +422,18 @@ Some considerations when using this job:
   times by a system test knowable person, the integration group can help with
   that
 
+### Autorelease Validate Job
+
+Trigger: **revalidate**
+
+This job runs the PROJECT-validate-autorelease-BRANCH job which is used as a
+quick sanity test to ensure that a patch does not depend on features that do
+not exist in the current release.
+
+The **revalidate** trigger is useful in cases where a project's verify job
+passed however validate failed due to infra problems or intermittent issues.
+It will retrigger just the validate-autorelease job.
+
 ## <a name="jjb_basic_configuration">Basic Job Configuration</a>
 
 To create jobs based on the above templates you can use the example