Merge "List dependency graph in validate-autorelease"
authorAnil Belur <abelur@linuxfoundation.org>
Thu, 19 Oct 2017 04:30:51 +0000 (04:30 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 19 Oct 2017 04:30:51 +0000 (04:30 +0000)
82 files changed:
docs/cloud-images.rst
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/generate-release-notes.sh [new file with mode: 0644]
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier.yaml
jjb/coe/coe-csit-openstack.yaml
jjb/coe/coe.yaml
jjb/controller/controller.yaml
jjb/daexim/daexim.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/csit-jobs-carbon.lst
jjb/integration/csit-jobs-nitrogen.lst
jjb/integration/csit-jobs-oxygen.lst
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-macros.yaml
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-test-jobs.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml [moved from jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml with 86% similarity]
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml [moved from jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml with 74% similarity]
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml [moved from jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml with 83% similarity]
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml [moved from jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml with 81% similarity]
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml [moved from jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml with 82% similarity]
jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml [moved from jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml with 80% similarity]
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml [moved from jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml with 80% similarity]
jjb/openflowplugin/openflowplugin-csit-scale.yaml [moved from jjb/openflowplugin/openflowplugin-csit-scalability.yaml with 88% similarity]
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/sfc/sfc.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/unimgr/unimgr-csit-legato.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc.yaml
jjb/vtn/vtn-csit-3node-manager.yaml
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn.yaml
jjb/yangtools/yangtools.yaml

index 1f09e470469238c3b42708f27bae5e3bfbd4dc18..fa2c269aa3ef53e26dd94d4f0ab75d00f83420d3 100644 (file)
@@ -9,6 +9,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - devstack - 20170606-0344
 * CentOS 7 - devstack - 20170609-0220
 * CentOS 7 - devstack - 20170808-0528
+* CentOS 7 - devstack - 20171014-2147
 * CentOS 7 - devstack - newton - 20170117-0005
 * CentOS 7 - devstack-mitaka - 20170130-0523
 * CentOS 7 - devstack-mitaka - 20170314-2255
@@ -17,15 +18,20 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - devstack-newton - 20170606-0427
 * CentOS 7 - devstack-newton - 20170707-0359
 * CentOS 7 - devstack-newton - 20170808-0528
+* CentOS 7 - devstack-newton - 20171014-2147
 * CentOS 7 - devstack-ocata - 20170606-0821
 * CentOS 7 - devstack-ocata - 20170609-0221
 * CentOS 7 - devstack-ocata - 20170808-0528
+* CentOS 7 - devstack-ocata - 20171014-2148
+* CentOS 7 - devstack-ocata - 20171016-0219
 * CentOS 7 - devstack-pike - 20170901-2223
+* CentOS 7 - devstack-pike - 20171014-2148
 * CentOS 7 - docker - 20170117-0003
 * CentOS 7 - docker - 20170120-1434
 * CentOS 7 - docker - 20170607-0203
 * CentOS 7 - docker - 20170609-0220
 * CentOS 7 - docker - 20170808-0528
+* CentOS 7 - docker - 20171016-0023
 * CentOS 7 - java-builder - 20170117-0004
 * CentOS 7 - java-builder - 20170126-0058
 * CentOS 7 - java-builder - 20170309-2355
@@ -36,6 +42,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - java-builder - 20170707-0359
 * CentOS 7 - java-builder - 20170807-1102
 * CentOS 7 - java-builder - 20170807-2145
+* CentOS 7 - java-builder - 20171014-2148
 * CentOS 7 - robot - 20170117-0004
 * CentOS 7 - robot - 20170210-1803
 * CentOS 7 - robot - 20170328-0206
@@ -43,6 +50,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - robot - 20170606-0345
 * CentOS 7 - robot - 20170609-0220
 * CentOS 7 - robot - 20170808-0529
+* CentOS 7 - robot - 20171016-0219
 * Fedora 23 (20151030 cloud)
 * Ubuntu 14.04 - devstack - 20170117-0004
 * Ubuntu 14.04 - docker - 20170117-0003
@@ -51,6 +59,7 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 - gbp - 20170706-1254
 * Ubuntu 14.04 - gbp - 20170808-0524
 * Ubuntu 14.04 - gbp - 20170823-0530
+* Ubuntu 14.04 - gbp - 20171016-0224
 * Ubuntu 14.04 - mininet - 20170117-0003
 * Ubuntu 14.04 - mininet - 20170130-0425
 * Ubuntu 14.04 - mininet - 20170207-2055
@@ -59,6 +68,7 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 - mininet - 20170609-0220
 * Ubuntu 14.04 - mininet - 20170611-0950
 * Ubuntu 14.04 - mininet - 20170808-0158
+* Ubuntu 14.04 - mininet - 20171001-1002
 * Ubuntu 14.04 - mininet-ovs-2.3 - 20170117-0004
 * Ubuntu 14.04 - mininet-ovs-2.5 - 20170117-0004
 * Ubuntu 14.04 - mininet-ovs-23 - 20170130-0415
@@ -76,5 +86,8 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
 * Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
 * Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
+* Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+* Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 * Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548
+* Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212
 * Ubuntu 16.04 LTS (2016-05-03 cloudimg)
index 0baa3cf48cba73b360c8001f224dab3f6a0e5c51..df3d0d3127d955ef90284fdacd4d1cd63c7305f0 100644 (file)
@@ -31,4 +31,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
index 49980f6e02e401ed66bf5dc230f068fde51adaea..100b7110384f2642cec3ab52c3fd5a1d4773190c 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'aaa'
index ad6eb69cd91d4961729ab6c6473f5ad66fdfe969..33df2fd7df51e9025dfa19413417ccf6b4092a79 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'alto'
index 238fe9b5be20f767ac013208132bd49178171abe..172dc106563606613f2284474a36eddc13c6c839 100644 (file)
 - builder:
     name: autorelease-generate-release-notes
     builders:
-      - shell: |
-          cd $WORKSPACE/scripts/release_notes_management
-          java -jar target/autonotes.jar
-          if [ -f  "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" ]; then
-              mkdir -p $WORKSPACE/archives
-              cp -vf "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" "$WORKSPACE/archives"
-          fi
+      - shell: !include-raw:
+          - generate-release-notes.sh
 
 - publisher:
     # Search console log for failures and email status to the release mailing list.
index 37399fddc60f2d9ebcf9e38e53d69c474c30b681..a34404c4eb01f9104ac74e27f04ef2703507f747 100644 (file)
           - version-bump.sh
 
     publishers:
-      - trigger-parameterized-builds:
-          - project: 'autorelease-generate-release-notes-{stream}'
-            condition: UNSTABLE_OR_BETTER
-            trigger-with-no-params: true
       - lf-infra-publish
 
 - job-template:
     name: 'autorelease-generate-release-notes-{stream}'
 
+    ######################
+    # Default parameters #
+    ######################
+
+    gerrit_merge_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: generate-release-notes .+$
+
+    #####################
+    # Job Configuration #
+    #####################
+
     project-type: freestyle
     node: centos7-java-builder-2c-4g
 
           branch: '{branch}'
           stream: '{stream}'
           lftools-version: '{lftools-version}'
+      - string:
+          name: RELEASE
+          description: Release to generate release notes for.
 
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
+          branch: '$GERRIT_BRANCH'
+          refspec: '$GERRIT_REFSPEC'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
           choosing-strategy: default
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     triggers:
-      - timed: '0 0 * * 0'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on: '{obj:gerrit_merge_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
 
     builders:
-      - lf-maven-install:
-          mvn-version: mvn33
-      - maven-target:
-          maven-version: mvn33
-          pom: '$WORKSPACE/scripts/release_notes_management/pom.xml'
-          goals: |
-              clean package
-              {opendaylight-infra-mvn-opts}
-          settings: autorelease-settings
-          settings-type: cfp
-          global-settings: global-settings
-          global-settings-type: cfp
       - autorelease-generate-release-notes
 
     publishers:
diff --git a/jjb/autorelease/generate-release-notes.sh b/jjb/autorelease/generate-release-notes.sh
new file mode 100644 (file)
index 0000000..08773f7
--- /dev/null
@@ -0,0 +1,55 @@
+#!/bin/bash -x
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# This script generates Service Release notes and appends them to the release
+# notes in the docs project and submits a patch.
+
+RELEASE=${RELEASE:-$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep generate-release-notes | awk '{print $2}')}
+if [ -z "$RELEASE" ]; then
+    echo "ERROR: The RELEASE variable is not set."
+    exit 1
+fi
+
+./scripts/release-notes-generator.sh "$RELEASE"
+
+# Archive the notes
+if [ -f  "$WORKSPACE/release-notes.rst" ]; then
+    mkdir -p "$WORKSPACE/archives"
+    cp -f "$WORKSPACE/release-notes.rst" "$WORKSPACE/archives/${RELEASE,,}"
+fi
+
+# Generate a docs patch for the notes
+DOCS_DIR=$(mktemp -d)
+git clone -b "$GERRIT_BRANCH" https://git.opendaylight.org/gerrit/docs.git "$DOCS_DIR"
+cd "$DOCS_DIR" || exit 1
+cp "$WORKSPACE/release-notes.rst" "docs/release-notes/release-notes-${RELEASE,,}.rst"
+git add docs/release-notes/
+
+GERRIT_COMMIT_MESSAGE="Update release notes"
+GERRIT_TOPIC="autogenerate-release-notes"
+CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \
+               limit:1 owner:self is:open project:docs \
+               message:"$GERRIT_COMMIT_MESSAGE" \
+               topic:"$GERRIT_TOPIC" | \
+               grep 'Change-Id:' | \
+               awk '{{ print $2 }}')
+
+if [ -z "$CHANGE_ID" ]; then
+    git commit -sm "$GERRIT_COMMIT_MESSAGE"
+else
+    git commit -sm "$GERRIT_COMMIT_MESSAGE" -m "Change-Id: $CHANGE_ID"
+fi
+
+git status
+git remote add gerrit "ssh://jenkins-$SILO@git.opendaylight.org:29418/docs.git"
+
+# Don't fail the build if this command fails because it's possible that there
+# is no changes since last update.
+git review --yes -t "$GERRIT_TOPIC" || true
index 86903309b951b8bb5655c2af503f265f62d52285..614df1ae66765fcc80bedad42c655a5ddb78c681 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'bgpcep'
index 950a32e66edf85236e3c2f68cffb341f57a83e38..e7984cc1389881f5e31aea75ef69ea76676af225 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'bier'
index c8d7e415b7f9f0926846a070785dbab4bff02edc..abef3f78231a2dc0bc0181e1e374dbe7676b97a7 100644 (file)
@@ -33,7 +33,7 @@
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_ocata}'
 
     create-initial-networks: 'True'
 
index 81c4fc7ff63ca6ae71c1bbfd1ac632566a79df1e..63820e7e56f4cc301e8535ec4af9e150b3d3f0fc 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     project: 'coe'
     project-name: 'coe'
index 595df4a19d72a8e616e77ebaa6ae7013c6f91871..61bed1501b377ea64fd6525cf5fbab322bc2032c 100644 (file)
@@ -7,6 +7,8 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'controller'
index a3ceedfccee3e477e8a4095077439354a7d81a86..1a4b42b91e5f0818a7df2d8e6a759896ef4cfffa 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     project: 'daexim'
     project-name: 'daexim'
index 91dbc7e6002c55b636526a162ad1d1a1480ee21a..853888f3fcd5ab72087737b71663fb5bff310be5 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'dlux'
index 18aeec376b983b697915f6e5a62ceb5226f62799..f1d9d7b25f2d7dd2072776fc2550341d1baef35e 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     project: 'dluxapps'
     project-name: 'dluxapps'
index 416c21d1e8d3dc52cd6783b6aa8efaba6596e0e7..d080873aac58feec86af8e52083be3f3ae5d2c48 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'eman'
index 054845c86fc461e283ecaf2bed8993e8627aaef0..51513b7c17dc7c52040884c909f7511a5ebdc6eb 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'faas'
index afd1f8091ff31f1cb55c5b96ecdfc4854690fc2a..9d5762eb478b6b8a666455b93a45612579078a6a 100644 (file)
@@ -32,7 +32,7 @@
 
     # Mininet configuration
     tools_system_count: 3
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Features to install
     install-features: 'odl-genius-rest'
index 9537c3e9d19022c8499e90e5bcc41e10f47904fc..11533fa56961fe6eb8d5053669cc645acb06fcc6 100644 (file)
@@ -7,6 +7,8 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'genius'
index 4e494e6bf70108968f052cd4ce1d8379fee04a43..c38dce2088f0833b94b8811bbd1efc3e74e8b06b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4e494e6bf70108968f052cd4ce1d8379fee04a43
+Subproject commit c38dce2088f0833b94b8811bbd1efc3e74e8b06b
index 640a508df9cc2e5c1543e802fcd9996b5fe5dbf8..b5cbd74e654cb5e85fc009721caffa65131b40f1 100644 (file)
@@ -26,7 +26,7 @@
 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
index 0fc6787a1c2c2d665147896b6766e2d4d1a86950..20f4c4ba797939e0ac84c895331150cf31f0edd5 100644 (file)
@@ -27,7 +27,7 @@
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
 
     # Features to install
     install-features: >
index 8d25bb78ef7d78428030c4bfa71dc7d6bdb69df8..4ac606a6b6a1dd17223170e1478e9c4b655787d6 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'groupbasedpolicy'
index 3af61b89c9d6093b709d77c6f445cc63be190d9a..7912a13806c8313a7b67a4e9c30960a01e3e9fd1 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'honeycomb/vbd'
index c174df59d4cf521edd858af6508604970fbce7d2..f47e88d75458db4c051bcb873c3d893b280c9180 100644 (file)
@@ -7,6 +7,8 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'infrautils'
index 05b638a5f570d96ff4a3be87b90b791743235cc7..f53722af3da3aaa1e61f8e04755958ff1400f2e0 100644 (file)
@@ -61,18 +61,16 @@ nic-csit-1node-basic-all-carbon,
 ocpplugin-csit-1node-get-all-carbon,
 ocpplugin-csit-1node-scalability-all-carbon,
 of-config-csit-1node-basic-all-carbon,
+openflowplugin-csit-1node-cbench-only-carbon,
 openflowplugin-csit-1node-flow-services-all-carbon,
-openflowplugin-csit-1node-periodic-bulkomatic-perf-daily-only-carbon,
-openflowplugin-csit-1node-periodic-cbench-daily-only-carbon,
-openflowplugin-csit-1node-periodic-link-scalability-daily-only-carbon,
-openflowplugin-csit-1node-periodic-restconf-perf-daily-only-carbon,
-openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-carbon,
-openflowplugin-csit-1node-periodic-sw-scalability-daily-only-carbon,
-openflowplugin-csit-1node-scalability-only-carbon,
+openflowplugin-csit-1node-perf-bulkomatic-only-carbon,
+openflowplugin-csit-1node-perf-stats-collection-only-carbon,
+openflowplugin-csit-1node-scale-link-only-carbon,
+openflowplugin-csit-1node-scale-only-carbon,
+openflowplugin-csit-1node-scale-switch-only-carbon,
+openflowplugin-csit-3node-clustering-bulkomatic-only-carbon,
 openflowplugin-csit-3node-clustering-only-carbon,
-openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-carbon,
-openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-carbon,
-openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-carbon,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-carbon,
 ovsdb-csit-1node-upstream-southbound-all-carbon,
 ovsdb-csit-3node-upstream-clustering-only-carbon,
 packetcable-csit-1node-pcmm-all-carbon,
index 3db2a58b41a6d6314f3e7ecf994c1ebd5c69714d..a91958b323edc49789f073b67a6992251392096b 100644 (file)
@@ -64,18 +64,16 @@ nic-csit-1node-basic-all-nitrogen,
 ocpplugin-csit-1node-get-all-nitrogen,
 ocpplugin-csit-1node-scalability-all-nitrogen,
 of-config-csit-1node-basic-all-nitrogen,
+openflowplugin-csit-1node-cbench-only-nitrogen,
 openflowplugin-csit-1node-flow-services-all-nitrogen,
-openflowplugin-csit-1node-periodic-bulkomatic-perf-daily-only-nitrogen,
-openflowplugin-csit-1node-periodic-cbench-daily-only-nitrogen,
-openflowplugin-csit-1node-periodic-link-scalability-daily-only-nitrogen,
-openflowplugin-csit-1node-periodic-restconf-perf-daily-only-nitrogen,
-openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-nitrogen,
-openflowplugin-csit-1node-periodic-sw-scalability-daily-only-nitrogen,
-openflowplugin-csit-1node-scalability-only-nitrogen,
+openflowplugin-csit-1node-perf-bulkomatic-only-nitrogen,
+openflowplugin-csit-1node-perf-stats-collection-only-nitrogen,
+openflowplugin-csit-1node-scale-link-only-nitrogen,
+openflowplugin-csit-1node-scale-only-nitrogen,
+openflowplugin-csit-1node-scale-switch-only-nitrogen,
+openflowplugin-csit-3node-clustering-bulkomatic-only-nitrogen,
 openflowplugin-csit-3node-clustering-only-nitrogen,
-openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-nitrogen,
-openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-nitrogen,
-openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-nitrogen,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-nitrogen,
 ovsdb-csit-1node-upstream-southbound-all-nitrogen,
 ovsdb-csit-3node-upstream-clustering-only-nitrogen,
 packetcable-csit-1node-pcmm-all-nitrogen,
index a6dd8324d51247d0df5b0f89bcec4419366d23e6..84a47c6ec86420b663853477390f848ae923e10f 100644 (file)
@@ -64,18 +64,16 @@ nic-csit-1node-basic-all-oxygen,
 ocpplugin-csit-1node-get-all-oxygen,
 ocpplugin-csit-1node-scalability-all-oxygen,
 of-config-csit-1node-basic-all-oxygen,
+openflowplugin-csit-1node-cbench-only-oxygen,
 openflowplugin-csit-1node-flow-services-all-oxygen,
-openflowplugin-csit-1node-periodic-bulkomatic-perf-daily-only-oxygen,
-openflowplugin-csit-1node-periodic-cbench-daily-only-oxygen,
-openflowplugin-csit-1node-periodic-link-scalability-daily-only-oxygen,
-openflowplugin-csit-1node-periodic-restconf-perf-daily-only-oxygen,
-openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-oxygen,
-openflowplugin-csit-1node-periodic-sw-scalability-daily-only-oxygen,
-openflowplugin-csit-1node-scalability-only-oxygen,
+openflowplugin-csit-1node-perf-bulkomatic-only-oxygen,
+openflowplugin-csit-1node-perf-stats-collection-only-oxygen,
+openflowplugin-csit-1node-scale-link-only-oxygen,
+openflowplugin-csit-1node-scale-only-oxygen,
+openflowplugin-csit-1node-scale-switch-only-oxygen,
+openflowplugin-csit-3node-clustering-bulkomatic-only-oxygen,
 openflowplugin-csit-3node-clustering-only-oxygen,
-openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-oxygen,
-openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-oxygen,
-openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-oxygen,
+openflowplugin-csit-3node-clustering-perf-bulkomatic-only-oxygen,
 ovsdb-csit-1node-upstream-southbound-all-oxygen,
 ovsdb-csit-3node-upstream-clustering-only-oxygen,
 packetcable-csit-1node-pcmm-all-oxygen,
index f783d10ff2e8509467667f74d7ba55bef2d459af..d1771099eaae2678c6787592f23116e690934bc0 100644 (file)
@@ -52,7 +52,8 @@
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Dstream={stream}
               -Dsft.heap.max=4g
-              {opendaylight-infra-parallel-mvn-opts}
+              {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features for SFT.
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: integration-settings
index 741807c323f6dab57bd97497680cd6b8fde5b84d..d8625c6cb0aa9e3630590fe853f9f25244b3b8b4 100644 (file)
     name: distribution-check-warn-9191
     # Detect ODL bundles referenced cross-project from features, store them to a file to be archived.
     # Do not fail the build, this is just to inform interested contributors.
-    # TODO: Improve integration archiving macro so that it finds bug9191 log without us crating it in $WORKSPACE/.
+    # TODO: Improve integration archiving macro so that it finds bug_9191 log without us crating it in $WORKSPACE/.
     builders:
       - shell: |
           # No failure in this macro should affect the job result.
           set +e
-          rm -f "$WORKSPACE/bug9191.log"
+          rm -f "$WORKSPACE/bug_9191.log"
           pushd "$WORKSPACE/distribution/$KARAF_ARTIFACT/target/assembly/system/org/opendaylight"
           for folder in `ls`; do
-          find "$folder" -name \*features.xml | xargs fgrep -n '<bundle>' > bug9191.0.log
-          fgrep org.opendaylight bug9191.0.log | fgrep -v "org.opendaylight.$folder" >> "$WORKSPACE/bug9191.log"
-          rm bug9191.0.log
+          find "$folder" -name \*features.xml | xargs fgrep -n '<bundle>' > bug_9191.0.log
+          fgrep org.opendaylight bug_9191.0.log | fgrep -v "org.opendaylight.$folder" >> "$WORKSPACE/bug_9191.log"
+          rm bug_9191.0.log
           done
           popd
 
     # Current implementation will also include Bug 9191 violations,
     # presenting an unified diff with lines marked to be removed, among unmarked lines to compare to.
     # Do not fail the build, this is just to inform interested contributors.
-    # TODO: Improve integration archiving macro so that it finds bug9192 log without us crating it in $WORKSPACE/.
+    # TODO: Improve integration archiving macro so that it finds bug_9192 log without us crating it in $WORKSPACE/.
     builders:
       - shell: |
           # No failure in this macro should affect the job result.
           set +e
           pushd "$WORKSPACE/distribution/$KARAF_ARTIFACT/target/assembly/system/org/opendaylight"
-          find . -name \*features.xml | xargs fgrep -n '<bundle>' > "$WORKSPACE/bug9192.0.log"
+          find . -name \*features.xml | xargs fgrep -n '<bundle>' > "$WORKSPACE/bug_9192.0.log"
           popd
-          fgrep org.opendaylight bug9192.0.log > "$WORKSPACE/bug9192.1.log"
-          sort -s -t '<' -k 2 "$WORKSPACE/bug9192.1.log" > "$WORKSPACE/bug9192.2.log"
-          sort -u -s -t '<' -k 2 "$WORKSPACE/bug9192.1.log" > "$WORKSPACE/bug9192.3.log"
-          diff -U 999 -b -t -d "$WORKSPACE/bug9192.2.log" "$WORKSPACE/bug9192.3.log" > "$WORKSPACE/bug9192.diff.log"
-          rm -f "$WORKSPACE"/bug9192.?.log
+          fgrep org.opendaylight bug_9192.0.log > "$WORKSPACE/bug_9192.1.log"
+          sort -s -t '<' -k 2 "$WORKSPACE/bug_9192.1.log" > "$WORKSPACE/bug_9192.2.log"
+          sort -u -s -t '<' -k 2 "$WORKSPACE/bug_9192.1.log" > "$WORKSPACE/bug_9192.3.log"
+          diff -U 999 -b -t -d "$WORKSPACE/bug_9192.2.log" "$WORKSPACE/bug_9192.3.log" > "$WORKSPACE/bug_9192.diff.log"
+          rm -f "$WORKSPACE"/bug_9192.?.log
 
 - builder:
     name: distribution-check-bootup
index e33bc6d412f3012f1db087e169a57c278d38954e..f18f683e2097166bb7130bc0799d539640d062c0 100644 (file)
@@ -428,6 +428,19 @@ EOF
     ${SSH} ${MGRIP} "sudo bash /tmp/deploy_ha_proxy.sh"
 } # configure_haproxy_for_neutron_requests()
 
+# Collect the list of files on the hosts
+function list_files () {
+    local ip=$1
+    local folder=$2
+    ${SSH} ${ip} "sudo find /etc > /tmp/find.etc.txt"
+    ${SSH} ${ip} "sudo find /opt/stack > /tmp/find.opt.stack.txt"
+    ${SSH} ${ip} "sudo find /var > /tmp/find2.txt"
+    rsync --rsync-path="sudo rsync" -arv --list-only ssh ${ip}:/var/ > ${folder}/rsync.var.txt
+    scp ${ip}:/tmp/find.etc.txt ${folder}
+    scp ${ip}:/tmp/find.opt.stack.txt ${folder}
+    scp ${ip}:/tmp/find2.txt ${folder}
+}
+
 function collect_logs () {
     set +e  # We do not want to create red dot just because something went wrong while fetching logs.
 
@@ -495,9 +508,11 @@ EOF
         scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
         scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
         scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/opt/stack/tempest/etc/tempest.conf ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
+        list_files "${!OSIP}" "${NODE_FOLDER}"
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/usr/lib/systemd/system/haproxy.service ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
@@ -523,6 +538,7 @@ EOF
         scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
+        list_files "${!OSIP}" "${NODE_FOLDER}"
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/dmesg.log ${NODE_FOLDER}
index 95f25335c39be1d17c2fcb361b94c6af108709a8..8d9b06a9addc2508d046f6acca0d0dbe6be12685 100644 (file)
@@ -42,7 +42,7 @@
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
 
     # tools system image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available
index 0710a32f6a713bcde88d6715ead5aeec42f5d1b5..acb8c26dcf46d4000b6a2848358b5b67483ea1e3 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'l2switch'
index 4e1df523986960d094bbf1674f4781205661c8bc..459648a2e9f55bbb0b5015189d19282e586aa4ff 100644 (file)
@@ -25,7 +25,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Features to install
     install-features: 'odl-lacp-ui'
index 0666834a71cdc4c4e9719156a6e91fe366f79d72..94384bd04d8cf1da5d2c427f11b99c62bbf1030a 100644 (file)
@@ -7,7 +7,8 @@
     project-name: lf-infra-ci-workshop
     project: releng/ci-workshop
     build-node: centos7-java-builder-2c-4g
-    stream: master
+    stream: any
+    branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
@@ -20,7 +21,8 @@
     project-name: lf-infra-common-packer
     project: releng/common-packer
     build-node: centos7-java-builder-2c-4g
-    stream: master
+    stream: any
+    branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
@@ -36,7 +38,8 @@
     project-pattern: releng/docs
     build-node: centos7-java-builder-2c-4g
     rtd-project: lf-releng-docs
-    stream: master
+    stream: any
+    branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
@@ -52,7 +55,8 @@
     project-pattern: releng/global-jjb
     build-node: centos7-java-builder-2c-4g
     rtd-project: lf-releng-global-jjb
-    stream: master
+    stream: any
+    branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
@@ -68,7 +72,8 @@
     project-pattern: releng/lftools
     build-node: centos7-java-builder-2c-4g
     rtd-project: lf-releng-tools
-    stream: master
+    stream: any
+    branch: '*'
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
index f4723eb47f54519665ba3d0ea35e5ac4a1a58806..55b67066e916d4eb1bb0a3640c3556c238e73fcd 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'lispflowmapping'
index c937d67cbd235038c5642a93cf6c509084c53ff0..5da35e7d01438e2bbc9e2c17b9a8668f8f0b70f9 100644 (file)
@@ -7,6 +7,8 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'mdsal'
index 7555f5787c11c043718e2d93dcaa1801e7c2a373..ef1b6c17ec23297e9661ebb7509f8e46d234371a 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'nemo'
index 1148ba026275b413200f318bd116827109c27885..ab53771056951c46eb20c63722d7a7fa071c5771 100644 (file)
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # no mininet required
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
 
     # Features to install
     install-features: 'odl-netconf-callhome-ssh,odl-restconf'
index 8316a476cb5cebeabdf763c3a1813acd821c5945..7096461b415ec896dbd1dd73e16a83e291dc73af 100644 (file)
@@ -27,7 +27,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 14.04 - gbp - 20170823-0530
+    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
 
     # Features to install
     install-features: >
index 1c850ce8788c712df2872932997052435a19377c..a3379305a6bdaf809401b9590d11372366575d05 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'netconf'
index ccf4d62c4b5b2a95555d68414824c94e1360aa9b..357f515adccba8589340c024033a094c00d7c98a 100644 (file)
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
       - queens:
           openstack-branch: 'master'
           devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
           odl-ml2-branch: 'master'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
       - queens:
           openstack-branch: 'master'
           devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
           odl-ml2-branch: 'master'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
index faab9d73dd869cdc489a978ef75ce24f1b255e85..12f3174b4648497d209f9c63cf7ee6901545de20 100644 (file)
@@ -7,6 +7,11 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
 
     topology:
       - 1node:
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
       - queens:
           openstack-branch: 'master'
           devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
           odl-ml2-branch: 'master'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
     name: netvirt-csit-openstack-integration-nitrogen
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
 
     topology:
       - 1node:
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
       - queens:
           openstack-branch: 'master'
           devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
           odl-ml2-branch: 'master'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
     name: netvirt-csit-openstack-integration-carbon
     stream: 'carbon'
     branch: 'stable/carbon'
     karaf-version: karaf3
+    testplan: '{project}-{topology}-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
 
     topology:
       - 1node:
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-openstack.txt'
-
     functionality:
       - upstream-stateful:
-          sg-mode: 'stateful'
+          schedule: '@daily'
       - upstream-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - gate-stateful:
-          sg-mode: 'stateful'
+          schedule: '@daily'
+      - gate-stateful
       - gate-stateful-snat-conntrack:
-          sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
 
     openstack:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
           devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
     name: netvirt-csit-sfc-openstack-integration
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
+    security-group-mode: 'stateful'
 
     topology:
       - 1node:
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-
-    security-group-mode: 'stateful'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
index d573b3b67f34f87f4b0ad2f4d8f8dd2c69c33eee..f9802b39713d698e8d8aca543c79e428acfe6281 100644 (file)
@@ -8,6 +8,8 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
     stream:
       - oxygen:
index 2bd13426c8a70130a99efccfea06b829ac1247a1..d2b300b981a52ff6c3619aef6da8a51ad3021371 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'neutron'
index f97d0dcfe9aeb006ce4ce7a814a44132473873e2..0573c3760f86c2875cdd6ef3097bc44a691747d4 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'nic'
index 839d9614be84c17adc7519bec5e40ae55c10cc37..48fd9b1491f14e3d556b2f4ffc2b149442820227 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'ocpplugin'
index 241a67931fcb8dfc712c828bc8d77fdb0742c0ac..b1daea65bb45229f195aa4f7975a4cab4f4c7143 100644 (file)
@@ -28,7 +28,6 @@
     archive-artifacts: ''
 
     # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
 - project:
index 1a4f66400d7a2b6d0cb3e654d4e5d73cf7d15fdb..7eaa59e773b7832bcf63308dcdc8f21695f09780 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'of-config'
index e20d5a0f7609bec89a9b0ed525c1ce67dcb1b2da..ca929de57f70f8f7938c27ec518450b3b153be88 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
 
     stream: nitrogen
     project: 'openflowjava'
similarity index 86%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 1f79451b3e2f6d53834008c1299ca6d349635529..3d95758b5e8bb87d28e63fbd156215fd4384f579 100644 (file)
@@ -1,14 +1,14 @@
 ---
 - project:
-    name: openflowplugin-csit-cbench-daily
+    name: openflowplugin-csit-cbench
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'cbench-daily'
+    functionality: 'cbench'
 
     # Project branches
     stream:
similarity index 74%
rename from jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
rename to jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 7cf30d232b21c8ba7fe0f8e0b00c9a8028ca74bd..55d2a23e37662e87c74e801d814d67b03c6897b7 100644 (file)
@@ -1,16 +1,16 @@
 ---
 - project:
-    name: openflowplugin-csit-bulkomatic-clustering-daily
+    name: openflowplugin-csit-clustering-bulkomatic
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
     functionality:
-      - bulkomatic-clustering-daily
-      - gate-bulkomatic-clustering-daily
+      - clustering-bulkomatic
+      - gate-clustering-bulkomatic
 
     # Project branches
     stream:
similarity index 83%
rename from jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
rename to jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index c06552104a129b041e89c38313318a4c1157d431..a35c00e121fb7cc4f3552c6793abd40386fbba50 100644 (file)
@@ -1,16 +1,16 @@
 ---
 - project:
-    name: openflowplugin-csit-bulkomatic-clustering-perf-daily
+    name: openflowplugin-csit-clustering-perf-bulkomatic
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
     functionality:
-      - bulkomatic-clustering-perf-daily
-      - gate-bulkomatic-clustering-perf-daily
+      - clustering-perf-bulkomatic
+      - gate-clustering-perf-bulkomatic
 
     # Project branches
     stream:
@@ -28,7 +28,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
 
     # Features to install
     install-features: >
index f22cf6577fce4b33d3e8d4771db42bbcde4714b6..c887d148012f020cba4bf20d630c8a98a8937d64 100644 (file)
@@ -33,4 +33,4 @@
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # mininet image
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
index 4969a8c04980273a02d524ce776d4e4e31a2667a..8485e0843b2932fdb970ffd849569f28a2a6e82e 100644 (file)
@@ -33,4 +33,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
index af8ada2254b968ee3e60f89e2b1989dd17ef6f66..2f3500d412347722e941aa73ba11b2d763081b2b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-longevity
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -36,6 +36,6 @@
     robot-options: '-v TEST_LENGTH:23h'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     schedule: '{schedule-saturday}'
similarity index 81%
rename from jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
rename to jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 5acba48a8f4495f373ac155bb835dd948cf343e1..3491ecdcc38071df21a07a1e8d56ac40544c1076 100644 (file)
@@ -1,16 +1,16 @@
 ---
 - project:
-    name: openflowplugin-csit-bulkomatic-perf-daily
+    name: openflowplugin-csit-perf-bulkomatic
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
     functionality:
-      - bulkomatic-perf-daily
-      - gate-bulkomatic-perf-daily
+      - perf-bulkomatic
+      - gate-perf-bulkomatic
 
     # Project branches
     stream:
@@ -28,7 +28,7 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Features to install
     install-features: >
similarity index 82%
rename from jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
rename to jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 70ebb772aa207d694990d2bb5c8beb258286be22..b8ee00cf8aaf9a4bd4ebc210a8f9ecf30e942155 100644 (file)
@@ -1,16 +1,16 @@
 ---
 - project:
-    name: openflowplugin-csit-scale-stats-collection-daily
+    name: openflowplugin-csit-perf-stats-collection
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
     functionality:
-      - scale-stats-collection-daily
-      - gate-scale-stats-collection-daily
+      - perf-stats-collection
+      - gate-perf-stats-collection
 
     # Project branches
     stream:
@@ -28,7 +28,7 @@
 
     # Job images
     odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest'
diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
deleted file mode 100644 (file)
index ea12e7d..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-restconf-clustering-perf-daily
-    jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'restconf-clustering-perf-daily'
-
-    # Project branches
-    stream:
-      - oxygen:
-          branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
-
-    # Features to install
-    install-features: >
-        odl-openflowplugin-flow-services-rest,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:100000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'REST Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'REST Performance'
-    02-plot-data-file: 'time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
deleted file mode 100644 (file)
index 6fd9bcc..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- project:
-    name: openflowplugin-csit-restconf-perf-daily
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'restconf-perf-daily'
-
-    # Project branches
-    stream:
-      - oxygen:
-          branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Job images
-    odl_system_flavor: '8 GB General Purpose v1'
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
-
-    # Features to install
-    # yamllint disable-line rule:line-length
-    install-features: >
-        odl-openflowplugin-flow-services-rest,
-        odl-jolokia,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:100000'
-
-    # Plot Info
-    01-plot-title: 'Flow Add rate'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'REST Performance'
-    01-plot-data-file: 'rate.csv'
-    02-plot-title: 'Flow Add time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'REST Performance'
-    02-plot-data-file: 'time.csv'
index 78ab76af7c9e0cd81ff9c42bfbe0d81e64641a7e..1425bd90243d2b37ce0cd63867a4a1974acf2186 100644 (file)
@@ -32,4 +32,4 @@
     robot-options: '-v SWITCHES:3'
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
similarity index 80%
rename from jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
index 29db0436dc3c2776f2f64e93eabdfc69da0083a7..bb0238318341ac1e2a17a1a645e185aa444eb6d9 100644 (file)
@@ -1,14 +1,14 @@
 ---
 - project:
-    name: openflowplugin-csit-link-scalability-daily
+    name: openflowplugin-csit-scale-link
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'link-scalability-daily'
+    functionality: 'scale-link'
 
     # Project branches
     stream:
@@ -35,7 +35,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Plot Info
     01-plot-title: 'Maximum Links Full Mesh Topology'
similarity index 80%
rename from jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index 019ecb6a659cc78be6cf99e581a7e050f9b0673b..20c91caf42abb6837479286e4463f2dd928c5fc4 100644 (file)
@@ -1,14 +1,14 @@
 ---
 - project:
-    name: openflowplugin-csit-scalability-daily
+    name: openflowplugin-csit-scale-switch
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'sw-scalability-daily'
+    functionality: 'scale-switch'
 
     # Project branches
     stream:
@@ -34,7 +34,7 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     # Plot Info
     01-plot-title: 'Maximum Switches Linear Topology'
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-scalability.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scale.yaml
index a8b8e525839240678ce423ece54543269a37e1dd..27ffed7ed90a07ce1cb089b7cb790980e88548a9 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: openflowplugin-csit-scalability
+    name: openflowplugin-csit-scale
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
@@ -9,8 +9,8 @@
 
     # The functionality under test
     functionality:
-      - scalability
-      - gate-scalability
+      - scale
+      - gate-scale
 
     # Project branches
     stream:
index 2b5e64676f3bb0570014dd30a18cef2f3b8b5385..67c0675badafd98a38d3f303c07b764f36cf5933 100644 (file)
       - core:
           csit-list: >
               openflowplugin-csit-1node-gate-flow-services-all-{stream},
-              openflowplugin-csit-1node-gate-scalability-only-{stream},
-              openflowplugin-csit-1node-periodic-gate-scale-stats-collection-daily-only-{stream},
-              openflowplugin-csit-1node-periodic-gate-bulkomatic-perf-daily-only-{stream},
+              openflowplugin-csit-1node-gate-scale-only-{stream},
+              openflowplugin-csit-1node-gate-perf-stats-collection-only-{stream},
+              openflowplugin-csit-1node-gate-perf-bulkomatic-only-{stream},
               openflowplugin-csit-3node-gate-clustering-only-{stream},
-              openflowplugin-csit-3node-periodic-gate-bulkomatic-clustering-daily-only-{stream},
-              openflowplugin-csit-3node-periodic-gate-bulkomatic-clustering-perf-daily-only-{stream}
+              openflowplugin-csit-3node-gate-clustering-bulkomatic-only-{stream},
+              openflowplugin-csit-3node-gate-clustering-perf-bulkomatic-only-{stream}
 
       - netvirt:
           csit-list: >
index f9f79d0067acc0bb0e97f2d901b04f8469fb985a..0d720a5e675934ba8a639bbf75db5e8d4be01dff 100644 (file)
@@ -7,6 +7,8 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'openflowplugin'
index c95ebd933b91d80d33f102996b0594ec2d974a05..0cdae53de81de2e83c857d11ebb6332d166baf34 100644 (file)
@@ -7,6 +7,8 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'ovsdb'
index 379c1b86d173d180ac02bb7e87f0cada3bf2a789..2f5b98d6ad1e75c57b3607c5cd56824b467c8d88 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'packetcable'
index 4ca86b32d8e5e824f81d47d5bb4c0687f8e6f953..8e0976932b759d924cf7d8728f2eb758e3d5d74f 100644 (file)
@@ -64,6 +64,9 @@
     bundle-url: 'last'
 
     # CSIT images configuration
+    openstack_system_image_newton: 'CentOS 7 - devstack-newton - 20171014-2147'
+    openstack_system_image_ocata: 'CentOS 7 - devstack-ocata - 20171016-0219'
+    openstack_system_image_pike: 'CentOS 7 - devstack-pike - 20171014-2148'
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
     docker_system_flavor: 4 GB General Purpose v1
@@ -79,7 +82,7 @@
     openstack_system2_image: CentOS 7 - devstack - 20171014-2147
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170808-0158
+    tools_system_image: Ubuntu 14.04 - mininet - 20171001-1002
 
     # Default Robot framework options
     robot-options: ''
         -T1.5C
         {opendaylight-infra-mvn-opts}
 
+    # JavaDoc
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+
     # Python
     toxdir: ''
 
         bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
         distribution-deploy-oxygen,
         distribution-offline-oxygen,
-        openflowplugin-csit-1node-periodic-longevity-only-oxygen
+        openflowplugin-csit-1node-longevity-only-oxygen
     csit-weekly-list-nitrogen: >
         controller-csit-1node-notifications-longevity-only-nitrogen,
         controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
         bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen,
         distribution-deploy-nitrogen,
         distribution-offline-nitrogen,
-        openflowplugin-csit-1node-periodic-longevity-only-nitrogen
+        openflowplugin-csit-1node-longevity-only-nitrogen
     csit-weekly-list-carbon: >
         controller-csit-1node-notifications-longevity-only-carbon,
         controller-csit-3node-cs-chasing-leader-longevity-only-carbon,
         bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
         distribution-deploy-carbon,
         distribution-offline-carbon,
-        openflowplugin-csit-1node-periodic-longevity-only-carbon
+        openflowplugin-csit-1node-longevity-only-carbon
index db726654461497ea7409478896c4f7b65bbd044b..e0c6f5a3257b5c40e084d07bf3e2d36b3a8603b6 100644 (file)
@@ -46,7 +46,8 @@
           build-timeout: 60
       - devstack-pre-pip-pike:
           build-timeout: 75
-      - docker
+      - docker:
+          build-timeout: 60
       - gbp
       - java-builder:
           build-timeout: 75
index 35d55d11aff0a61b7229c6d99fed882f7969b039..660bb8b069bead147452d2d0f62f7a64b32cb5ba 100644 (file)
@@ -7,6 +7,8 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'sfc'
index e8a705c63b24bf9a9508119a2b98fb1abad006a2..2b411425909a6de6e87cc1a9e74561f16f214723 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'snmp'
index 982c6c19b5b85c678ea59e8a5c6623aac5b01e04..3907ef1957951e020200d66b095885329701db3b 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'snmp4sdn'
index a8538cd7b820055fd2747f2b872a6c89786c3903..41729186d70f5ad7a36823718655c944d32e4173 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'sxp'
index 3d0b85aa3aa94af0c6b24c79b6a17a78e485f176..567c712661adec9727c2f6f1b5f99bce0e546bc0 100644 (file)
@@ -35,4 +35,4 @@
     robot-options: ''
 
     # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
index 1b6f6565d1b0bc13cdfb6f19021d511bcf225e1b..269b6d4fc54517d1b6ebc7f10aa1a47264ac0b74 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'unimgr'
index f0a648e95e3fa7ba1511ac39d7847930db054635..33b8d22c7af50fefdc681a501415aab820f0c380 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'usc'
index 8d7b5f12dc7f0fbb1c3be363cc2d59b0a7ad2942..055bd062e8eb05b7f9c6a0c121a0d09250cdc363 100644 (file)
@@ -31,4 +31,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'
index fd5ef6f3f95a611a8c17b904443a68d81e6ced3e..e1668090ced7627b95ffe022855b3145a5f550d7 100644 (file)
@@ -20,7 +20,7 @@
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+          tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
     install:
       - only:
index 3a5367f40ef9208675274dfc3bf12c1067eab843..74a9434438cdb1167843621e883d7d82f8f02b94 100644 (file)
@@ -31,4 +31,4 @@
     # Robot custom options
     robot-options: ''
 
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
index 8e6f8f1de1dfb4662663c7d966cc8dfbf8aa684a..6111c043d05a0142f8d4c48f617224b1af69ea2c 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'vtn'
index 3573a6aac4bf9ce8edd187ed5dd24b77159821e1..91a75963513dfd6f1f50c189d1ce5eb5cc2c609c 100644 (file)
@@ -1,17 +1,16 @@
 ---
 - project:
-    name: yangtools-oxygen
+    name: yangtools-master
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: oxygen
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'master'
+    project: yangtools
+    project-name: yangtools
+    branch: master
+    stream: master
+
     jdks:
       - openjdk8
     maven:
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
+    mvn-version: mvn33
+
+    dependencies: ''
+    email-upstream: '[yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
 - project:
     name: yangtools-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'yangtools'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
 - project:
     name: yangtools-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'yangtools'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
 - project:
     name: yangtools-sonar
     jobs: