Merge "general improvement of published graphs for 1node and 3node controller benchm...
authorVratko Polák <vrpolak@cisco.com>
Mon, 7 Nov 2016 15:26:45 +0000 (15:26 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 7 Nov 2016 15:26:45 +0000 (15:26 +0000)
53 files changed:
docs/jenkins.rst
jenkins-scripts/builder.sh
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
jjb/daexim/daexim.yaml [new file with mode: 0644]
jjb/docs/docs-rtd.yaml
jjb/docs/docs.yaml
jjb/genius/genius-patch-test.yaml
jjb/include-raw-deploy-archives.sh
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/include-raw-integration-deploy-devstack-testing.sh
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
jjb/integration/include-raw-integration-install-robotframework.sh
jjb/integration/include-raw-integration-start-cluster-run-test.sh
jjb/integration/integration-distribution-jobs.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/l2switch/l2switch-patch-test.yaml [new file with mode: 0644]
jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
jjb/netvirt/netvirt-csit-clustering.yaml
jjb/netvirt/netvirt-csit.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml [moved from jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml with 61% similarity]
jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml [moved from jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml with 63% similarity]
jjb/netvirt/netvirt-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt-sonar.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex-dependencies.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-sonar.yaml
jjb/packaging/packaging.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/releng-templates.yaml
jjb/sfc/sfc-python.yaml
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn-manager-csit-1node-openstack.yaml

index 86817c585b3f897db4d275b3a8f89c7d6dd7d1c4..a74cd82d543019a72eaa37c7b7738298fedfd357 100644 (file)
@@ -612,7 +612,7 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
       </tr>
       <tr>
         <td colspan="2">
-          This job builds a distrbution against your patch, passes distribution sanity test
+          This job builds a distrbution against your patch, tiggers distribution sanity CSIT jobs
           and reports back the results to Gerrit. Leave a comment with trigger keyword above
           to activate it for a particular patch.
 
@@ -624,13 +624,34 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
             <p>
               Running the "test-distribution" trigger will cause Jenkins to
               remove it's existing vote if it's already -1 or +1'd a comment.
-              You will need to re-run your verify job (recheck) after running
+              You will need to re-run your verify jobs (recheck) after running
               this to get Jenkins to put back the correct vote.
             </p>
           </div>
         </td>
       </tr>
 
+      <tr class="warning">
+        <td><b>Job Template</b><br/>{project}-distribution-check-{stream}</td>
+        <td><b>Gerrit Trigger</b><br/>recheck | redistcheck</td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          This job runs the PROJECT-distribution-check-BRANCH job which is
+          building also integration/distribution project in order to run SingleFeatureTest.
+
+          The <b>redistcheck</b> trigger is useful in cases where a project's
+          other jobs passed, however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, redistcheck could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Redistcheck is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
+          Recheck triggers every job involved in verifying latest patch set in the Change.
+        </td>
+      </tr>
+
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-integration-{stream}</td>
         <td></td>
@@ -653,13 +674,17 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
       </tr>
       <tr>
         <td colspan="2">
-          The Merge job template is similar to the Verify Job Template except
-          it will trigger once a Gerrit patch is merged into the repo. It
-          also automatically runs the Maven goals <b>source:jar</b> and
-          <b>javadoc:jar</b>.
-
-          This job will upload artifacts to OpenDaylight's
+          This job will trigger once a Gerrit patch is merged into the repo.
+          It will build HEAD of the current project branch and also run the Maven goals
+          <b>source:jar</b> and <b>javadoc:jar</b>.
+          Artifacts are uploaded to OpenDaylight's
           <a href="https://nexus.opendaylight.org">Nexus</a> on completion.
+
+          Running the "remerge" trigger is possible before a Change is merged,
+          in which case it will cause Jenkins to remove it's existing vote
+          if it's already -1 or +1'd a comment.
+          You will need to re-run your verify jobs (recheck) after running
+          this to get Jenkins to put back the correct vote.
         </td>
       </tr>
 
@@ -691,7 +716,7 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
 
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-validate-autorelease-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>recheck | reverify</td>
+        <td><b>Gerrit Trigger</b><br/>recheck | revalidate</td>
       </tr>
       <tr>
         <td colspan="2">
@@ -700,9 +725,13 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
           features that do not exist in the current release.
 
           The <b>revalidate</b> 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.
+          other job passed, however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, revalidate could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Revalidate is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
         </td>
       </tr>
 
@@ -712,14 +741,25 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
       </tr>
       <tr>
         <td colspan="2">
-            The Verify job template creates a Gerrit Trigger job that will
-            trigger when a new patch is submitted to Gerrit.
+          The Verify job template creates a Gerrit Trigger job that will
+          trigger when a new patch is submitted to Gerrit.
+          The job only builds the project code (including unit and integration tests).
+
+          The <b>reverify</b> trigger is useful in cases where a project's
+          other jobs passed however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, reverify could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Reverify is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
+          Recheck triggers every job involved in verifying latest patch set in the Change.
         </td>
       </tr>
 
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-verify-node-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>recheck | reverify</td>
+        <td><b>Gerrit Trigger</b><br/>recheck | renode</td>
       </tr>
       <tr>
         <td colspan="2">
@@ -731,20 +771,44 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
           {nodever} containing the directory relative to the project root
           containing the nodejs package.json and version of node you wish to
           run tests with.
+
+          The <b>renode</b> trigger is useful in cases where a project's
+          other jobs passed, however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, renode could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Renode is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
+          Recheck triggers every job involved in verifying latest patch set in the Change.
         </td>
       </tr>
 
       <tr class="warning">
-        <td><b>Job Template</b><br/>{project}-verify-python-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>recheck | reverify</td>
+        <td><b>Job Template</b><br/>{project}-verify-python-{stream} | {project}-verify-tox-{stream}</td>
+        <td><b>Gerrit Trigger</b><br/>recheck | retox</td>
       </tr>
       <tr>
         <td colspan="2">
-          This job template can be used by a project that contains Python. It
+          This job template can be used by a project that uses Tox to build. It
           simply installs a Python virtualenv and uses tox to run the tests
           defined in the project's tox.ini file. If the tox.ini is anywhere
           other than the project's repo root, the path to its directory
           relative to the project's repo root should be passed as {toxdir}.
+
+          The 2 template names verify-python & verify-tox are identical and are
+          aliases to each other. This allows the project to use the naming that
+          is most reasonable for them.
+
+          The <b>retox</b> trigger is useful in cases where a project's
+          other verify jobs passed, however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, retox could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Retox is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
+          Recheck triggers every job involved in verifying latest patch set in the Change.
         </td>
       </tr>
 
index c125bf5e0427dc6936fbffc97199d647f7d28033..d607757aa4a2cd315e0ac37258453f33a6b1ef38 100755 (executable)
@@ -35,11 +35,11 @@ tar -xvf hbase-0.94.27.tar.gz
 mkdir /tmp/cassandra
 cd /tmp/cassandra
 
-wget --no-verbose http://apache.osuosl.org/cassandra/2.1.14/apache-cassandra-2.1.14-bin.tar.gz
+wget --no-verbose http://apache.osuosl.org/cassandra/2.1.16/apache-cassandra-2.1.16-bin.tar.gz
 
 echo "Installing the Cassandra Server..."
 
-tar -xvf apache-cassandra-2.1.14-bin.tar.gz
+tar -xvf apache-cassandra-2.1.16-bin.tar.gz
 
 # Installation of Elasticsearch node
 
index 9bc8417c6edf555114bc1595e7d65d9b495f7ff7..fb2fa065a39c969c490060d188763b2082d12a23 100644 (file)
@@ -51,9 +51,9 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
index bc0dabe40069d4305e45b2bd9b02479abcce8982..870c21be29793d6493908ab2d2c6b02b5b0f1ef5 100644 (file)
         jdk: 'openjdk8'
         integration-test: carbon
     - boron:
-        next-release-tag: Boron
+        next-release-tag: Boron-SR2
         branch: 'stable/boron'
         jdk: 'openjdk8'
         integration-test: boron
     - beryllium:
-        next-release-tag: Beryllium-SR4
+        next-release-tag: Beryllium-SR5
         branch: 'stable/beryllium'
         jdk: 'openjdk7'
         integration-test: beryllium
 
     project: 'releng/autorelease'
-    archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch'
+    archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch all-bundles.tar.gz'
index 26b6d97920572154b20ab33da9f8d9d9f39d992d..2e62a848da9e8752aebda744da87ebec52712526 100644 (file)
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[autorelease]'
         - trigger-parameterized-builds:
             - project: 'integration-distribution-test-{integration-test}'
               condition: UNSTABLE_OR_BETTER
-              property-file: variables.prop
+              property-file: variables.jenkins-trigger
               fail-on-missing: true
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
index 67564700cf77eeec6a7fd50a0261afd994852da7..29b0cf5d7614a79761816fa7a4290904cbe43993 100644 (file)
@@ -15,3 +15,9 @@ echo "VERSION: ${VERSION}"
 REPOID=`grep "Created staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
 echo BUNDLEURL=${NEXUSURL}/${REPOID}/org/opendaylight/integration/distribution-karaf/${VERSION}/distribution-karaf-${VERSION}.zip > $WORKSPACE/variables.prop
 echo "BUNDLEURL: ${BUNDLEURL}"
+
+# Copy variables.prop to variables.jenkins-trigger so that the end of build
+# trigger can pick up the file as input for triggering downstream jobs.
+# This allows variables.prop to get archive to logs.opendaylight.org while not
+# breaking the downstream trigger due to missing file from archiving.
+cp variables.prop variables.jenkins-trigger
diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
new file mode 100644 (file)
index 0000000..1c0407f
--- /dev/null
@@ -0,0 +1,38 @@
+- project:
+    name: daexim-carbon
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'daexim'
+    project-name: 'daexim'
+    stream: carbon
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - 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-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
+- project:
+    name: daexim-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'daexim'
+    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-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index fd24db2e424466a8b982643846c3059450268b7e..a24dcceee5fadaee764f1526d1ea6ff1df229fb6 100644 (file)
@@ -59,6 +59,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[docs]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'true'
+                    exclude-trivial-rebase: 'false'
                     exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'redocs'
+                    # FIXME: Describe this job in docs/jenkins.rst including the BEWARE section.
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '**'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[docs]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
index e94e89118d40c59cb7eb0c6ae54ce3ff4a617cba..d911c4a491ffcbb16175d028ebbbfc72258eee37 100644 (file)
@@ -1,67 +1,3 @@
-- project:
-    name: docs-carbon
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: True
-    project: 'docs'
-    project-name: 'docs'
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
-    mvn-settings: 'docs-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[docs] [odlparent]'
-    archive-artifacts: ''
-
-- project:
-    name: docs-boron
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: True
-    project: 'docs'
-    project-name: 'docs'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
-    mvn-settings: 'docs-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[docs] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: docs-beryllium
     jobs:
index bef9cdb3e06a2ef9cbd3bc134a4be05fdbfc764a..3860cab571f1488e71e57a706dec059d8aafc87e 100644 (file)
@@ -6,21 +6,21 @@
     # The project name
     project: 'genius'
 
-    feature: 'all'
-
     # Project branches
     stream:
         - carbon:
             branch: 'master'
             jdk: 'openjdk8'
-            csit-list: >
-                genius-csit-1node-genius-only-{stream},
-                genius-csit-1node-genius-all-{stream}
-
         - boron:
             branch: 'stable/boron'
             jdk: 'openjdk8'
+
+    feature:
+        - netvirt:
+            csit-list: >
+                netvirt-csit-1node-openstack-mitaka-transparent-{stream}
+
+        - genius:
             csit-list: >
                 genius-csit-1node-genius-only-{stream},
                 genius-csit-1node-genius-all-{stream}
-
index 936d3eabc34bf65b39b9493e946869b3db8af013..3873406ff6ccedca50806228a01f73dae910ab1a 100644 (file)
@@ -89,8 +89,8 @@ touch $ARCHIVES_DIR/_sys-info.txt
 
 # Magic string used to trim console logs at the appropriate level during wget
 echo "-----END_OF_BUILD-----"
-wget -O $ARCHIVES_DIR/_console-output.log ${{BUILD_URL}}consoleText
-sed -i '/^-----END_OF_BUILD-----$/,$d' $ARCHIVES_DIR/_console-output.log
+wget -O $ARCHIVES_DIR/console.log ${{BUILD_URL}}consoleText
+sed -i '/^-----END_OF_BUILD-----$/,$d' $ARCHIVES_DIR/console.log
 
 gzip $ARCHIVES_DIR/*.txt $ARCHIVES_DIR/*.log
 # find and gzip any 'text' files
@@ -100,5 +100,5 @@ find $ARCHIVES_DIR -type f -print0 \
                 | cut -d: -f1 \
                 | xargs -d'\n' -r gzip
 
-zip -r archives.zip $JENKINS_HOSTNAME/
+zip -r archives.zip $JENKINS_HOSTNAME/ > $ARCHIVES_DIR/_archives-zip.log
 du -sh archives.zip
index d59a67ebc6180f883f503383ce3fe6e1cbe13796..169683650f647acfe28cee88b7e48a14c8533692 100644 (file)
@@ -30,7 +30,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all'
+    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
 
     # Robot custom options
     robot-options: ''
index 0b48b807becd1d4fb7e97c36ba59ea3385d60d46..368223639c05c8610796c2ebab11bdb922b2ae13 100644 (file)
@@ -179,7 +179,7 @@ cat testplan.txt
 SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
+pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
 -v JAVA_HOME:${JAVA_HOME} -v BUNDLE_URL:${ACTUALBUNDLEURL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
 -v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
 -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
index 68bfe24980e0e12250c663e1d7d58dae0eff5608..9354338320d01525119d733622f564911a9ed6ad 100644 (file)
@@ -12,7 +12,7 @@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
 
 echo "Starting Robot test suites ${SUITES} ..."
 
-pybot -e exclude \
+pybot --removekeywords wuks -e exclude \
 -v WORKSPACE:$WORKSPACE -v USER_HOME:$HOME -L TRACE \
 -v DEVSTACK_SYSTEM_USER:$USER \
 -v DEVSTACK_SYSTEM_IP:$OPENSTACK_CONTROL_NODE_IP \
index ea00cfc4e8a8aceea48c5f82523d12c8ee2a646f..b8e0f6998f155f68c01699c05359bb997cb904f7 100644 (file)
@@ -419,7 +419,7 @@ scp ${WORKSPACE}/disable_firewall.sh ${OPENSTACK_CONTROL_NODE_IP}:/tmp
 ${SSH} ${OPENSTACK_CONTROL_NODE_IP} "sudo bash /tmp/disable_firewall.sh"
 echo "sleep for a minute and print hypervisor-list"
 sleep 60
-${SSH} ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list;nova-manage service list"
+${SSH} ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list"
 
 #Need to disable firewalld and iptables in compute nodes as well
 for i in `seq 1 $((NUM_OPENSTACK_SYSTEM - 1))`
@@ -449,8 +449,8 @@ cat testplan.txt
 SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUALBUNDLEURL} \
--v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
+pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
+-v BUNDLE_URL:${ACTUALBUNDLEURL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
 -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_1_IP} -v ODL_SYSTEM_2_IP:${ODL_SYSTEM_2_IP} \
 -v ODL_SYSTEM_3_IP:${ODL_SYSTEM_3_IP} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} -v CONTROLLER_USER:${USER} -v OS_USER:${USER} \
 -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} -v OS_CONTROL_NODE_IP:${OPENSTACK_CONTROL_NODE_IP} \
index 1566f03981d870743048d220029a473794607ce0..7f26dbc0e805168ab52d8acd4d93c7ab8538a4bc 100644 (file)
@@ -24,9 +24,8 @@ set -exu
 # Make sure pip itself us up-to-date.
 pip install --upgrade pip
 
-pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr
-pip install --upgrade robotframework{,-{httplibrary,requests,selenium2library}}
-pip install --upgrade robotframework-sshlibrary pycparser==2.13  # TODO: Unfreeze when cryptography stops failing on pycparser-2.14-py2.py3-none-any.whl
+pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr pyhocon
+pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
 
 # Module jsonpath is needed by current AAA idmlite suite.
 pip install --upgrade jsonpath-rw
index bbcd8dea909aec03fe2c76f39ff0d29b803c6bb3..1f54c60d4c617e072c1cd6b500d6b853d0ced553 100644 (file)
@@ -110,7 +110,7 @@ cat testplan.txt
 SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} \
+pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} \
 -v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUALBUNDLEURL} -v JAVA_HOME:${JAVA_HOME} \
 -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
 -v CONTROLLER:${ODL_SYSTEM_IP} -v CONTROLLER1:${ODL_SYSTEM_2_IP} -v CONTROLLER2:${ODL_SYSTEM_3_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
index f5b0d4e867c272e901fc50db5fd7ca49061e8bc0..486d164f3964efff5b4dc28752f342ca46be1a10 100644 (file)
@@ -56,7 +56,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-relevant-patch-submitted:
+        - gerrit-trigger-patch-submitted:
             name: 'integration/distribution'
             branch: '{branch}'
 
@@ -96,6 +96,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
 
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
 # Template: integration-distribution-deploy-{stream}
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
index 98a219757f13eb826d1f322f55f0fd2fbeb028c7..10a7e6d02cc79dd13a9dbb51e8ac2ea2f3e8e072 100644 (file)
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
             description: 'Openstack version to use with devstack'
         - string:
             name: ODL_ML2_DRIVER_REPO
-            default: 'https://github.com/openstack/networking-odl'
+            default: '{odl-ml2-driver-repo}'
             description: 'URL to fetch networking-odl driver'
         - string:
             name: ODL_ML2_VERSION
             openstack-vms: '{openstack-vms}'
 
     triggers:
-        - integration-csit-all
+        - timed: '{schedule}'
 
     builders:
         - integration-copy-ssh-keys
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
             description: 'Openstack version to use with devstack'
         - string:
             name: ODL_ML2_DRIVER_REPO
-            default: 'https://github.com/openstack/networking-odl'
+            default: '{odl-ml2-driver-repo}'
             description: 'URL to fetch networking-odl driver'
         - string:
             name: ODL_ML2_VERSION
             openstack-vms: '{openstack-vms}'
 
     triggers:
-        - integration-csit-all
+        - timed: '{schedule}'
 
     builders:
         - integration-copy-ssh-keys
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
 
 
index 39c73071670f3990f04c428afa416073fa8dd44b..d3543774466e31bfa8aef64d51c09720057e30c1 100644 (file)
@@ -1,7 +1,7 @@
 - project:
     name: integration-test
     jobs:
-        - '{project-name}-verify-python-{stream}'
+        - '{project-name}-verify-tox-{stream}'
         - 'integration-csit-verify-1node-library'
         - 'integration-distribution-test-{stream}'
         - 'integration-patch-test-{stream}'
                 vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
 
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[integration]'
         - integration-csit-archive-build
         - opendaylight-infra-shiplogs:
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[integration]'
 
 # Template: integration-patch-test-{stream}
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[$GERRIT_PROJECT]'
 
 # Template: integration-multipatch-test-{stream}
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
new file mode 100644 (file)
index 0000000..3628b71
--- /dev/null
@@ -0,0 +1,26 @@
+- project:
+    name: l2switch-patch-test
+    jobs:
+        - '{project}-patch-test-{feature}-{stream}'
+
+    # The project name
+    project: 'l2switch'
+
+    # Project branches
+    stream:
+        - carbon:
+            branch: 'master'
+            jdk: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
+
+    feature:
+        - all:
+            csit-list: >
+                l2switch-csit-1node-periodic-host-scalability-daily-only-{stream},
+                l2switch-csit-1node-scalability-only-{stream},
+                l2switch-csit-1node-switch-only-{stream}
index e25f66ebaa8427b2bb73546e5dd0500f9c82939e..1cfa363ab1a73450f71d73d32ad36d41fcdf9a6f 100644 (file)
@@ -3,11 +3,21 @@
     jobs:
         - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
 
-    # The project name
     project: 'netvirt'
 
-    # The project name
-    functionality: 'openstack'
+    functionality:
+        - upstream-transparent:
+            schedule: 'H H * * *'
+            sg-mode: 'transparent'
+        - upstream-stateful:
+            schedule: 'H H * * *'
+            sg-mode: 'stateful'
+        - upstream-learn:
+            schedule: 'H H * * *'
+            sg-mode: 'learn'
+        - gate-transparent:
+            schedule: ''
+            sg-mode: 'transparent'
 
     stream:
         - carbon:
@@ -16,9 +26,6 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
 
     openstack:
         - mitaka:
 
     openstack-vms: 3
 
-    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-netvirt-openstack'
 
     odl-enable-l3: 'yes'
 
-    public-bridge: 'br-ex'
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
@@ -44,4 +49,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
+    security-group-mode: '{sg-mode}'
index d518096f256623b5ca63704779a465fd41cc528a..768b19629dd051ce71d12adf25200e9159b83b5a 100644 (file)
@@ -3,11 +3,21 @@
     jobs:
         - '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
 
-    # The project name
     project: 'netvirt'
 
-    # The project name
-    functionality: 'openstack'
+    functionality:
+        - upstream-transparent:
+            schedule: 'H H * * *'
+            sg-mode: 'transparent'
+        - upstream-stateful:
+            schedule: 'H H * * *'
+            sg-mode: 'stateful'
+        - upstream-learn:
+            schedule: 'H H * * *'
+            sg-mode: 'learn'
+        - gate-transparent:
+            schedule: ''
+            sg-mode: 'transparent'
 
     stream:
         - carbon:
@@ -16,9 +26,6 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
 
     openstack:
         - mitaka:
 
     openstack-vms: 4
 
-    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-netvirt-openstack'
 
     odl-enable-l3: 'yes'
 
     enable-haproxy: 'yes'
 
-    public-bridge: 'br-ex'
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
@@ -46,4 +51,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
+    security-group-mode: '{sg-mode}'
index 1b9f891f0532a56991697361e73da18f4c3e6798..d7b665bbb340f6929325068ba68a628b49110bce 100644 (file)
@@ -1,11 +1,11 @@
 - project:
-    name: netvirt-csit-clustering
+    name: netvirt-legacy-csit-clustering
     jobs:
         - '{project}-csit-3node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
-    project: 'netvirt'
+    project: 'netvirt-legacy'
 
     # The functionality under test
     functionality: 'clustering'
index 4b11e10b60f402e693382d600dfe951b2fb96f6d..9344def1b103feab0485e214ad99bd65d91d4186 100644 (file)
@@ -1,11 +1,11 @@
 - project:
-    name: netvirt-csit
+    name: netvirt-legacy-csit
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
-    project: 'netvirt'
+    project: 'netvirt-legacy'
 
     # The functionality under test
     functionality: 'openstack-basic'
index bda7c745a9d2cf06cceae7bb5260503af2b5e454..3b7760beb1874f52f46cd9083cb7c8c296904ea9 100644 (file)
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[netvirt]'
         - text-finder:
             fileset: "**/target/surefire-reports/*.xml"
similarity index 61%
rename from jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
rename to jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
index 407051640da893352bb89dfc6a935cc2a2111e8f..7a1cac1e004b7b6756d2324a1484d67776a8012a 100644 (file)
@@ -1,14 +1,17 @@
 - project:
-    name: netvirt-vpnservice-csit-openstack-integration
+    name: netvirt-legacy-csit-openstack-integration
     jobs:
         - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
 
-    project: 'netvirt-vpnservice'
+    # The project name
+    project: 'netvirt-legacy'
 
+    # The project name
     functionality:
-        - 'transparent'
-        - 'stateful'
-        - 'learn'
+        - upstream:
+            schedule: 'H H * * *'
+        - gate:
+            schedule: ''
 
     stream:
         - carbon:
@@ -17,6 +20,9 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     openstack:
         - mitaka:
 
     openstack-vms: 3
 
-    install-features: 'odl-netvirt-openstack'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     odl-enable-l3: 'yes'
 
-    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
+    public-bridge: 'br-ex'
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
@@ -42,4 +46,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: '{functionality}'
+    security-group-mode: 'none'
similarity index 63%
rename from jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
rename to jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
index 50fad15eeb256ad1a6032c3f715b8cd041454890..8194d134b81659ab60cc881172a9b3f32edd5a41 100644 (file)
@@ -1,13 +1,17 @@
 - project:
-    name: netvirt-vpnservice-3node-csit-openstack-integration
+    name: netvirt-legacy-3node-csit-openstack-integration
     jobs:
         - '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
 
     # The project name
-    project: 'netvirt-vpnservice'
+    project: 'netvirt-legacy'
 
     # The project name
-    functionality: 'openstack'
+    functionality:
+        - upstream:
+            schedule: 'H H * * *'
+        - gate:
+            schedule: ''
 
     stream:
         - carbon:
@@ -16,6 +20,9 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     openstack:
         - mitaka:
 
     openstack-vms: 4
 
-    install-features: 'odl-netvirt-openstack'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     odl-enable-l3: 'yes'
 
     enable-haproxy: 'yes'
 
-    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
+    public-bridge: 'br-ex'
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
@@ -43,4 +48,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'transparent'
+    security-group-mode: 'none'
index 984e8d844f64e9bdf5fdbef27b6f5b4249483453..acac17bd196167908a4d1639f27792be60ce5897 100644 (file)
@@ -35,9 +35,9 @@
         - gerrit:
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck-opendaylight'
             projects:
index a87bc589df51c755ac2f96e57da9e67c709c5bfd..dda793a5c25176bbfc5cda185e78bb274398da42 100644 (file)
     feature:
         - legacy:
             csit-list: >
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream}
-
+                netvirt-legacy-csit-1node-openstack-mitaka-gate-{stream},
+                netvirt-legacy-csit-1node-openstack-basic-only-{stream}
         - current:
             csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream}
-
-        - all:
+                netvirt-csit-1node-openstack-mitaka-gate-transparent-{stream}
+        - legacy-cluster:
+            csit-list: >
+                netvirt-legacy-csit-3node-clustering-only-{stream},
+                netvirt-legacy-csit-3node-openstack-mitaka-openstack-{stream}
+        - current-cluster:
             csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream},
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream}
+                netvirt-csit-3node-openstack-newton-openstack-{stream}
\ No newline at end of file
index 46342585a950d431078033358b261e5d5f39318a..695bb1becebd75c6e911e3d4b3cc79d60922c521 100644 (file)
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[netvirt]'
         - jacoco-report
         - findbugs
index 3431514b24dde66f2e9ab0bc3f16ce7d28941c40..0cbce891404d99f2184138d9aa79789b089cedd5 100644 (file)
@@ -20,7 +20,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
     schedule: 'H H * * *'
 
     # Plot Info
-    01-plot-title: 'Max number of switch links'
+    01-plot-title: 'Maxmum Links Full Mesh Topology'
     01-plot-yaxis: 'Links'
-    01-plot-group: 'Inventory Switch Link Scalability'
+    01-plot-group: 'Link Scalability'
     01-plot-data-file: 'links.csv'
+    02-plot-title: 'Topology Discover Time'
+    02-plot-yaxis: 'Seconds'
+    02-plot-group: 'Link Scalability'
+    02-plot-data-file: 'time.csv'
index b9b9f3475effc32c1b9f10760b998c835c94f415..de2506766b73d514b459579011f1acae637e3e1a 100644 (file)
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
 
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
     # Trigger jobs (daily)
     schedule: 'H H * * *'
 
     # Plot Info
-    01-plot-title: 'Max number of switch links'
+    01-plot-title: 'Maximum Links Full Mesh Topology'
     01-plot-yaxis: 'Links'
-    01-plot-group: 'Inventory Switch Link Scalability'
+    01-plot-group: 'Link Scalability'
     01-plot-data-file: 'links.csv'
+    02-plot-title: 'Topology Discover Time'
+    02-plot-yaxis: 'Seconds'
+    02-plot-group: 'Link Scalability'
+    02-plot-data-file: 'time.csv'
index 46073b52ff950ff5c0c2e232fcf9fca8309139ce..be18e675ee390f408146d897f4658b2a80cb9c48 100644 (file)
@@ -24,7 +24,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
+    robot-options: '-v TEST_LENGTH:23h'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'
index c34ee5be818bd5848139f43e5919b985fa063e04..3475cafc70b758176042cec9e43e36de7a3422f3 100644 (file)
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
+    robot-options: '-v TEST_LENGTH:23h'
+
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml
deleted file mode 100644 (file)
index 2f9a5ef..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-daily-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-daily'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
-
-    # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'switches.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
deleted file mode 100644 (file)
index 6859a1f..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-daily
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-daily'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
-
-    # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:50'
-
-    # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'switches.csv'
index 53c4d574b56088b37a78c8390497b9ffbd355afd..e9b87608a495c047af2f68d22457704c98095192 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-sw-scalability-daily-old
+    name: openflowplugin-csit-scalability-daily-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -20,7 +20,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
     schedule: 'H H * * *'
 
     # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'max_found.csv'
+    01-plot-title: 'Maximum Switches Linear Topology'
+    01-plot-yaxis: 'Switches'
+    01-plot-group: 'Switch Scalability'
+    01-plot-data-file: 'switches.csv'
+    02-plot-title: 'Topology Discover Time'
+    02-plot-yaxis: 'Seconds'
+    02-plot-group: 'Switch Scalability'
+    02-plot-data-file: 'time.csv'
index 40d609c08d71602396528093b82b4c3750869b6c..be35738caf915ae9e145e78c4caaa4e89bf39a96 100644 (file)
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-sw-scalability-daily
+    name: openflowplugin-csit-scalability-daily
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
 
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
     # Trigger jobs (daily)
     schedule: 'H H * * *'
 
     # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'max_found.csv'
+    01-plot-title: 'Maximum Switches Linear Topology'
+    01-plot-yaxis: 'Switches'
+    01-plot-group: 'Switch Scalability'
+    01-plot-data-file: 'switches.csv'
+    02-plot-title: 'Topology Discover Time'
+    02-plot-yaxis: 'Seconds'
+    02-plot-group: 'Switch Scalability'
+    02-plot-data-file: 'time.csv'
index e45b148938d217190434c5313bbec9034b9a24de..658063d7440869dea193c3c0481d3c43e4f81505 100644 (file)
@@ -82,6 +82,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
index 6f68a9434528fae392031f7202fc0922d21dc203..87ccc1f1093772d1b1c817ea707fe1fe310f4397 100644 (file)
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - archive:
             artifacts: 'install-root/*.tgz'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - archive:
             artifacts: 'install-root/*.tgz'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[opflex]'
         - archive:
             artifacts: 'install-root/*.tgz'
index 39f3e92320c429c7dc21e7e9fad6b5a288bbd1b6..82b321a6963a618bc0e1d2cdd1b54642b665defc 100644 (file)
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[ovsdb]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
index 44487210bf7adf3f01b2690568c9170aa058fdcb..a1cd88cfdc3225aea818d8f34827caf9043620a6 100644 (file)
@@ -90,6 +90,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[ovsdb]'
         - jacoco-report
         - opendaylight-infra-shiplogs:
index 2e52f4cfa4677aa9295b65e2e6783820d392988c..f06a64028762353effc7b891f5f7e3b83de2ea52 100644 (file)
             artifacts: '{archive-artifacts}'
         - string:
             name: VERSION_MAJOR
-            default: '4'
+            default: '5'
             description: 'OpenDaylight major (element) version number to build'
         - string:
             name: VERSION_MINOR
-            default: '2'
+            default: '0'
             description: 'OpenDaylight minor (SR) version number to build'
         - string:
             name: VERSION_PATCH
             description: 'RPM version for the given ODL major.minor.patch'
         - string:
             name: SYSD_COMMIT
-            default: 'c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed'
+            default: '07f7c83b0ef46ad3809e5be03e09a77fe554eeae'
             description: 'Version of ODL systemd unitfile to download and package in ODL RPM'
         - string:
             name: CODENAME
-            default: 'Beryllium-SR2'
+            default: 'Boron'
             description: 'Elemental codename for the ODL release, including SR if applicable'
         - string:
             name: DOWNLOAD_URL
-            default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz'
+            default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz'
             description: 'URL to ODL tarball artifact to repackage into RPM'
         - string:
             name: CHANGELOG_DATE
-            default: 'Wed May 11 2016'
+            default: 'Sun Aug 25 1991'
             description: 'Date this RPM was defined'
         - string:
             name: CHANGELOG_NAME
index 85bc3b81a342acb334ceb612a707d5ba32d8d5c7..0f2a8a18f4d88ce1664701b72eecfd78ca5020fb 100644 (file)
@@ -11,6 +11,9 @@
     build-timeout: 360
     build-node: centos7-java-builder-2c-8g
 
+    email-recipients: 'jenkins@lists.opendaylight.org'
+    odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
+
     # openstack-infra-parameters defaults
     archive-artifacts: ''
     branch: master
index 8bd83398a4b730ee73cd4e85e43f91e0d0716f7a..985b7e62af3084337b114565d3e2f8e2bbb2945d 100644 (file)
@@ -74,9 +74,9 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
             build-timeout: '{build-timeout}'
 
     triggers:
+        - timed: '00 10 1 * *'
         - gerrit:
             server-name: 'OpenDaylight'
             trigger-on:
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
index 3dabc46b9980974f7e364bac80ec40f6cc4d3e03..c7e397cba19c77f43cf059f134c7b6779b884315 100644 (file)
             timeout: 360
             fail: true
 
+# Used only by opflex-verify-{stream} and {project-name}-verify-{stream}-{maven}-{jdks}
 - trigger:
     name: gerrit-trigger-patch-submitted
-    triggers:
-        - 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'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-
-- trigger:
-    name: gerrit-trigger-relevant-patch-submitted
     triggers:
         - gerrit:
             server-name: 'OpenDaylight'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+            # Force Jenkins always vote the values it should already have voted
+            # during the prior verify phase
+            override-votes: true
+            gerrit-build-started-verified-value: 1
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: 1
+            gerrit-build-unstable-verified-value: 1
+            gerrit-build-notbuilt-verified-value: 1
+            gerrit-build-started-codereview-value: 0
+            gerrit-build-successful-codereview-value: 0
+            gerrit-build-failed-codereview-value: 0
+            gerrit-build-unstable-codereview-value: 0
+            gerrit-build-notbuilt-codereview-value: 0
 
 - trigger:
     name: gerrit-trigger-patch-sonar
                 branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
+            # Force Jenkins always vote the values it should already have voted
+            # during the prior verify phase
+            override-votes: true
+            gerrit-build-started-verified-value: 1
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: 1
+            gerrit-build-unstable-verified-value: 1
+            gerrit-build-notbuilt-verified-value: 1
+            gerrit-build-started-codereview-value: 0
+            gerrit-build-successful-codereview-value: 0
+            gerrit-build-failed-codereview-value: 0
+            gerrit-build-unstable-codereview-value: 0
+            gerrit-build-notbuilt-codereview-value: 0
 
 - publisher:
     name: archive-artifacts
     name: email-notification
     publishers:
         - email-ext:
-            recipients: 'jenkins@lists.opendaylight.org'
-            reply-to:
+            recipients: '{email-recipients}'
+            reply-to: ''
             content-type: default
             subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
             body: |
             mark-unstable-if-failed: True
         - workspace-cleanup:
             exclude:
-              # autorelease-release-{stream} reqires vaiables.prop file to be preserved
-              # as the downstream test jobs fails invoke without automatically
-              - variables.prop
+              # Do not clean up *.jenkins-trigger files for jobs that use a
+              # properties file as input for triggering another build.
+              - '**/*.jenkins-trigger'
             fail-build: false
 
 - builder:
index 7b7b7aef1de7269925602abb0360f4f05deeb1da..9904fa7b79fea124b0608c69afe17803bb41917c 100644 (file)
@@ -55,6 +55,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - maven-deploy:
             id: ''
 
     wrappers:
         - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            # Distro-check jobs typically run within 10 - 30 minutes
+            # with 45 minutes being the occassional edge case.
+            # enforce a 60 minute limit to ensure stuck jobs get
+            # cleared up sooner.
+            build-timeout: '60'
 
     triggers:
         - gerrit:
                 - patchset-created-event:
                     exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'test-distribution'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'redistcheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
             projects:
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - postbuildscript:
             builders:
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '{email-upstream}'
         - findbugs
         - jacoco-report
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - maven-deploy:
             id: ''
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
                 - 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:
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[autorelease] [{project-name}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
     publishers:
         - findbugs
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - opendaylight-infra-shiplogs:
index 270820027e00aa11dc34578a4eaa0023b1b540ae..f6605551b459c7187ee3468ee386fefd7ed40d99 100644 (file)
@@ -55,6 +55,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[releng]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
-# Python Related
+# Generic tox-based verify action
 
-- job-template:
-    name: '{project-name}-verify-python-{stream}'
+- tox_builder_verify: &tox_builder_verify
+    name: tox_builder_verify
 
-    # Job template for python verify jobs
-    #
-    # The purpose of this job template is to run tox for projects using this
-    # template.
-    #
     # Required Variables:
     #     stream:    release stream (eg. boron or carbon)
     #     branch:    git branch (eg. stable/boron or master)
 
     logrotate:
         daysToKeep: '7'
-        numToKeep: '-1'
-        artifactDaysToKeep: '-1'
-        artifactNumToKeep: '-1'
 
     parameters:
         - opendaylight-infra-parameters:
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'retox'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
+- job-template:
+    name: '{project-name}-verify-tox-{stream}'
+
+    # Job template for verify jobs executing tox envlist
+    #
+    # The purpose of this job template is to run tox for projects using this
+    # template.
+    #
+    # Required Variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     toxdir:    directory containing the project's tox.ini relative to
+    #                the workspace. Empty works if tox.ini is at project root.
+
+    <<: *tox_builder_verify
+
+# Python (pep8) specific, project should migrate to {project-name}-verify-tox-{stream}
+
+- job-template:
+    name: '{project-name}-verify-python-{stream}'
+
+    # Job template for python verify jobs
+    #
+    # The purpose of this job template is to run tox for projects using this
+    # template.
+    #
+    # Required Variables:
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     toxdir:    directory containing the project's tox.ini relative to
+    #                the workspace. Empty works if tox.ini is at project root.
+
+    <<: *tox_builder_verify
+
 - job-template:
     name: '{project-name}-merge-rtd-{stream}'
     # Template for ReadTheDocs triggering
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'renode'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
index acf5a079abf52ba5fc8f5ec9e4aeebf51a0a25d7..a01779c96d24af15b65ff91db3ddd6d25a4d03a4 100644 (file)
@@ -57,9 +57,9 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
@@ -87,4 +87,5 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[sfc]'
index f1480d61c289c431c467d6244d73481f6229c688..32c927e7ac71f370cdcb18711bc445828c1f3dce 100644 (file)
         - carbon:
             branch: 'master'
             jre: 'openjdk8'
+            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -33,7 +35,6 @@
     # Robot custom options
     robot-options: ''
 
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
index 526f35e07d276b3f67d449d62e3caab255411e13..1e78e755ccade34c9ae1735fd2ef00e230268e3d 100644 (file)
         - carbon:
             branch: 'master'
             jre: 'openjdk8'
+            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+            mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -34,7 +36,6 @@
     # Robot custom options
     robot-options: ''
 
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
index d95339893a0e0b50214c2d7c31872aa74ed635c8..8716066fada69a8ecc9a38b43a316bc2cd4e45a0 100644 (file)
@@ -24,9 +24,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 1
 
@@ -44,4 +44,4 @@
 
     tenant-network-type: 'local'
 
-    security-group-mode: 'none'
\ No newline at end of file
+    security-group-mode: 'none'