Merge "ipsec over vxlan tunnel support."

diff --git a/.coafile b/.coafile
index 8d32fd0851d96ac72c4d30720210daff815f18d8..40e4c3ac1a4b5f5ef2bcc956b52efaa96fcfedf3 100644 (file)
--- a/.coafile
+++ b/.coafile
@@ -24,7 +24,23 @@ files = jenkins-scripts/**/*.sh,
     jjb/**/*.sh,
     scripts/**/*.sh
 ignore = jenkins-scripts/*-local-env.sh,
-    jjb/integration/*.sh
+    jjb/integration/include-raw-integration-compare-distributions.sh,
+    jjb/integration/include-raw-integration-configure-clustering.sh,
+    jjb/integration/include-raw-integration-deploy-controller-offline.sh,
+    jjb/integration/include-raw-integration-deploy-controller-run-test.sh,
+    jjb/integration/include-raw-integration-deploy-controller-verify.sh,
+    jjb/integration/include-raw-integration-deploy-openstack-run-test.sh,
+    jjb/integration/include-raw-integration-distribution-check.sh,
+    jjb/integration/include-raw-integration-get-bundle-url-root.sh,
+    jjb/integration/include-raw-integration-get-bundle-url.sh,
+    jjb/integration/include-raw-integration-get-bundle-vars.sh,
+    jjb/integration/include-raw-integration-get-slave-addresses.sh,
+    jjb/integration/include-raw-integration-list-jobs.sh,
+    jjb/integration/include-raw-integration-multipatch-distribution-test.sh,
+    jjb/integration/include-raw-integration-replace-block-text.sh,
+    jjb/integration/include-raw-integration-start-cluster-run-test.sh,
+    jjb/integration/include-raw-integration-replace-block-text.sh,
+    jjb/integration/include-raw-integration-start-cluster-run-test.sh
 shell = bash
 indent_size = 4
 use_spaces = yeah

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index e201cede5dc0052189e75f1a9727969833e64697..58beb477bc3152d1d4de9086360337acdb7c4755 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -19,6 +19,7 @@ Following are the list of published images available to be used with Jenkins job
 * CentOS 7 - java-builder - 20170311-0517
 * CentOS 7 - robot - 20170117-0004
 * CentOS 7 - robot - 20170210-1803
+* CentOS 7 - robot - 20170328-0206
 * Fedora 23 (20151030 cloud)
 * Ubuntu 14.04 - devstack - 20170117-0004
 * Ubuntu 14.04 - docker - 20170117-0003

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
new file mode 100644 (file)
index 0000000..11423ff
--- /dev/null
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -0,0 +1,32 @@
+---
+- project:
+    name: aaa-csit-tls
+    jobs:
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'aaa'
+
+    # The functionality under test
+    functionality: 'tls'
+
+    # Project branches
+    stream:
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+
+    install:
+      - only:
+          scope: 'only'
+
+    # Features to install
+    install-features: odl-restconf,
+        odl-netconf-all,
+        http
+
+    # Robot custom options
+    robot-options: ''
+
+    # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
+    tools_system_count: 0

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 94ded8d499e2e961b0603eea89de1ba64909452d..bc95076cae2d1477f602640cf64a33230d9878d6 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -71,11 +71,12 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: 'pom.xml'
-          goals: >
-              --quiet dependency:sources
+          goals: |
+              dependency:sources
+              --quiet
               -DoutputFile=$WORKSPACE/sources.log
               -DappendOutput
-              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m'
           settings: '{settings}'

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index fb85cf2ab3eb584aecfd0c15184b1579fe4fc3fb..671fd7d3eeb7f71368dc5e01207deffb629249b4 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -64,6 +64,7 @@
       - maven-exec:
           maven-version: 'mvn33'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -199,6 +200,7 @@
       - autorelease-maven-deploy
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
+          opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: 'mvn33'
           settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 269cf528cf1c284c9dd295f5ecab8503182f44f4..aa4ca9ce9bf9f6b1fc8a615d326757b5bb2191d0 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -16,6 +16,7 @@
       - maven-exec:
           maven-version: 'mvn33'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -74,11 +75,12 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
-              clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins
+          goals: |
+              clean deploy
+              -Pintegrationtests,docs,repoBuild
               -Dcheckstyle.skip=true
-              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
@@ -88,6 +90,7 @@
       - autorelease-maven-deploy
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
+          opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
           maven-version: 'mvn33'
           settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
@@ -109,6 +112,8 @@
             condition: UNSTABLE_OR_BETTER
             property-file: variables.jenkins-trigger
             fail-on-missing: true
+          - project: 'integration-distribution-test-{integration-test}'
+            condition: FAILED
           - project: 'packaging-build-rpm-master'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLEURL

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index 89506c19145b36b37262ccf1c25b94e8db80fe61..164349923d50221307ce44e53b760c2a3bd13fd9 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -29,6 +29,7 @@ rsync -avz --remove-source-files \
            "stage/org/opendaylight" m2repo/org/
 
 "$MVN" -V -B org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8:deploy-staged-repository \
+    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
     -DrepositoryDirectory="$(pwd)/m2repo" \
     -DnexusUrl="$NEXUS_STAGING_URL" \
     -DstagingProfileId="$NEXUS_STAGING_PROFILE" \

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
new file mode 100644 (file)
index 0000000..afa92be
--- /dev/null
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -0,0 +1,30 @@
+---
+- project:
+    name: bier-csit-basic
+    jobs:
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'bier'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+
+    install:
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
+
+    # Features to install
+    install-features: 'odl-bier-all'
+
+    # Robot custom options
+    robot-options: ''

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 7f3d5191684a5387b9bc69e7f3b6616a2d84fe41..2aef3457a49ea983d8b3f3e3ea911acf43f18ee7 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -4,6 +4,7 @@
     jobs:
       - 'docs-merge-rtd-{stream}'
       - 'docs-verify-rtd-{stream}'
+      - '{project-name}-verify-tox-{stream}'
 
     stream:
       - carbon:
@@ -13,8 +14,9 @@
       - beryllium:
           branch: 'stable/beryllium'
 
-    project: 'docs'
-    rtdproject: 'opendaylight'
+    project: docs
+    project-name: docs
+    rtdproject: opendaylight
     archive-artifacts: 'docs/_build/html/**'
 
 - job-template:
@@ -29,6 +31,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -78,6 +81,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index dadc6219884ba0b78b714c608c4385c031e95725..75afd356c80be13931d1d5d4ae87d7beacb05077 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -28,7 +28,7 @@
 
     # Mininet configuration
     tools_system_count: 2
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-23 - 20170210-0414
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
 
     # Features to install
     install-features: 'odl-genius-ui'

diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh
index 81bc096b12541fb1140fd838a65ac82b0121f5c0..fd25bc2d30391f56f332f8edf48f4c0b75eebb10 100644 (file)
--- a/jjb/include-raw-deploy-archives.sh
+++ b/jjb/include-raw-deploy-archives.sh
@@ -77,7 +77,7 @@ if [ ! -z "$ARCHIVE_ARTIFACTS" ]; then
     shopt -s globstar  # Enable globstar to copy archives
     for f in $ARCHIVE_ARTIFACTS; do
         [[ -e $f ]] || continue  # handle the case of no files to archive
-        echo "Archiving $f"
+        echo "Archiving $f" >> "$WORKSPACE/.archives/$ARCHIVES_DIR/_archives.log"
         dir=$(dirname "$f")
         mkdir -p "$WORKSPACE/archives/$dir"
         mv "$f" "$WORKSPACE/archives/$f"
@@ -121,5 +121,5 @@ find "$ARCHIVES_DIR" -type f -print0 \
 # Compress Java heap dumps using xz
 find "$ARCHIVES_DIR" -type f -name \*.hprof -print0 | xargs -0 xz
 
-zip -r archives.zip "$JENKINS_HOSTNAME/" > "$ARCHIVES_DIR/_archives-zip.log"
+zip -r archives.zip "$JENKINS_HOSTNAME/" >> "$ARCHIVES_DIR/_archives.log"
 du -sh archives.zip

diff --git a/jjb/include-raw-stack-delete.sh b/jjb/include-raw-stack-delete.sh
index 4f03d062b818143bff37b9b4287c38b667661961..99b45dfef41234fa6a6267e3f159be09aa778743 100644 (file)
--- a/jjb/include-raw-stack-delete.sh
+++ b/jjb/include-raw-stack-delete.sh
@@ -2,9 +2,9 @@
 if [ -d "$WORKSPACE/.venv-openstack" ]; then
     # shellcheck disable=SC1090
     source "$WORKSPACE/.venv-openstack/bin/activate"
-    OS_STATUS=$(openstack --os-cloud rackspace stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
+    OS_STATUS=$(openstack stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
     if [ "$OS_STATUS" == "CREATE_COMPLETE" ] || [ "$OS_STATUS" == "CREATE_FAILED" ]; then
         echo "Deleting $STACK_NAME"
-        openstack --os-cloud rackspace stack delete --yes "$STACK_NAME"
+        openstack stack delete --yes "$STACK_NAME"
     fi
 fi

diff --git a/jjb/integration/distribution-jobs.yaml b/jjb/integration/distribution-jobs.yaml
index 16052698b97f28dbb9d276e0d7ce064c76068a61..ef584dc92e75b09dc8cc1e2e5d4cf0bb4576f8eb 100644 (file)
--- a/jjb/integration/distribution-jobs.yaml
+++ b/jjb/integration/distribution-jobs.yaml
@@ -37,6 +37,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -121,6 +122,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -237,6 +239,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -285,6 +288,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/integration/distribution/distribution-check.yaml b/jjb/integration/distribution/distribution-check.yaml
index 804c463c1509cbb08902c61d45fd35b03a15dc4f..4ce501286820d92431346f913e09729ded94d22d 100644 (file)
--- a/jjb/integration/distribution/distribution-check.yaml
+++ b/jjb/integration/distribution/distribution-check.yaml
@@ -21,6 +21,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index 703e8f6aef414b0582a165e22b4fe25c292b358f..9642c34698cc6b4eb56b2d2dd83c93d39026f663 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -433,6 +433,7 @@ mkdir -p ${OS_CTRL_FOLDER}
 scp ${OPENSTACK_CONTROL_NODE_IP}:/opt/stack/devstack/nohup.out ${OS_CTRL_FOLDER}/stack.log
 scp ${OPENSTACK_CONTROL_NODE_IP}:/var/log/openvswitch/ovs-vswitchd.log ${OS_CTRL_FOLDER}/ovs-vswitchd.log
 scp ${OPENSTACK_CONTROL_NODE_IP}:/etc/neutron/neutron.conf ${OS_CTRL_FOLDER}/neutron.conf
+scp ${OPENSTACK_CONTROL_NODE_IP}:/etc/nova/nova.conf ${OS_CTRL_FOLDER}/nova.conf
 rsync -avhe ssh ${OPENSTACK_CONTROL_NODE_IP}:/opt/stack/logs/* ${OS_CTRL_FOLDER} # rsync to prevent copying of symbolic links
 scp extra_debug.sh ${OPENSTACK_CONTROL_NODE_IP}:/tmp
 ${SSH} ${OPENSTACK_CONTROL_NODE_IP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"

diff --git a/jjb/integration/include-raw-integration-get-slave-addresses.sh b/jjb/integration/include-raw-integration-get-slave-addresses.sh
index 4cbb12b5af953a2da22fc1d703a1403239c0a129..eb58dca52147d195c287caea2070f2c8f8223e24 100644 (file)
--- a/jjb/integration/include-raw-integration-get-slave-addresses.sh
+++ b/jjb/integration/include-raw-integration-get-slave-addresses.sh
@@ -5,7 +5,7 @@ TOOLS_SYSTEM=()
 OPENSTACK_SYSTEM=()
 
 source $WORKSPACE/.venv-openstack/bin/activate
-ADDR=(`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | \
+ADDR=(`openstack stack show -f json -c outputs $STACK_NAME | \
        jq -r '.outputs[] | \
               select(.output_key | match("^vm_[0-9]+_ips$")) | \
               .output_value | .[]'`)

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index eb81e29fa6b1ef9aecb2e1ecfae33b0a1a4f88c8..6ad635cdc16fa34f68c65a7e6249d5b4581f1399 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -10,14 +10,15 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-ROBOT_VENV=`mktemp -d --suffix=robot_venv`
-echo ROBOT_VENV=${ROBOT_VENV} >> ${WORKSPACE}/env.properties
+ROBOT_VENV=$(mktemp -d --suffix=robot_venv)
+echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 
 # The --system-site-packages parameter allows us to pick up system level
 # installed packages. This allows us to bake matplotlib which takes very long
 # to install into the image.
-virtualenv --system-site-packages ${ROBOT_VENV}
-source ${ROBOT_VENV}/bin/activate
+virtualenv --system-site-packages "${ROBOT_VENV}"
+# shellcheck disable=SC1090
+source "${ROBOT_VENV}/bin/activate"
 
 set -exu
 
@@ -25,8 +26,11 @@ set -exu
 pip install --upgrade pip
 
 pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr pyhocon
-pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
-pip install --upgrade robotframework-pycurllibrary
+pip install --upgrade robotframework-httplibrary \
+    robotframework-requests \
+    robotframework-sshlibrary \
+    robotframework-selenium2library \
+    robotframework-pycurllibrary
 
 # Module jsonpath is needed by current AAA idmlite suite.
 pip install --upgrade jsonpath-rw

diff --git a/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
index 00dd9e42e25171cf254a676b15215a769c0dbdb2..b1fbae329b511a647a37389de6597bf4e1541fcb 100644 (file)
--- a/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
+++ b/jjb/integration/include-raw-integration-rebase-gerrit-patch.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Make sure changes merged after patch creation are applied.
 
 set -exu

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index e8c00bb247016214b9ae1eba61fecbe1d9d3b79a..69795b620d8094e1e944960c3b9bd6bfa17a818f 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -39,6 +39,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -124,6 +125,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -233,6 +235,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -454,6 +457,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -540,6 +544,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -648,6 +653,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -758,6 +764,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -981,6 +988,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -1153,6 +1161,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -1328,6 +1337,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: '$GERRIT_REFSPEC'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d10f0a939667ce502dad3d6dfc4d80f95b1aea78..9bd22af536e9295113b8bb7a09b529d934c39042 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -20,7 +20,6 @@
           jre: 'openjdk8'
           csit-list: '{csit-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
-          schedule: 'H H * * 0-4'
           schedule-weekly: 'H 12 * * 0'
 
       - boron:
@@ -29,7 +28,6 @@
           jre: 'openjdk8'
           csit-list: '{csit-list-boron}'
           csit-weekly-list: ''
-          schedule: 'H H * * 0-4'
           schedule-weekly: 'H 12 * * 0'
 
       - beryllium:
@@ -38,7 +36,6 @@
           jre: 'openjdk7'
           csit-list: '{csit-list-beryllium}'
           csit-weekly-list: ''
-          schedule: 'H H * * 6'
           schedule-weekly: 'H 12 * * 0'
 
     # tools system image
@@ -67,6 +64,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{test-branch}'
           refspec: 'refs/heads/{test-branch}'
@@ -169,9 +167,6 @@
       - integration-jdk-version:
           jdkversion: '{jre}'
 
-    triggers:
-      - timed: '{schedule}'
-
     builders:
       - trigger-builds:
           - project: '{csit-list}'
@@ -202,6 +197,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '$GERRIT_PROJECT'
           branch: '{branch}'
           refspec: '$GERRIT_REFSPEC'
@@ -317,6 +313,7 @@
       - integration-distribution-branch:
           branch: '{branch}'
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/distribution'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index b91105ca17fc85436c6f59729f3e5559ff09c9c8..dbe97f6e8f67f0b8d6d87bfd271295f42aacf89a 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -29,7 +29,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-23 - 20170210-0414
+    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
 
     # Features to install
     install-features: 'odl-lacp-ui'

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index e63b20470428b27198cfba1b5260e70f985cd795..73a0c9f085696b99881947bbcaea8e24bcdc413b 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -156,6 +156,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index d3ba8330b97aba5d152ec696e2e94653165166dd..76f5cf82bab08fef0d8cd0777418ed9787270e70 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -30,6 +30,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 867024b6ed3af4a07aa1f22bccd20ac2e7e21d88..52282f9f3479fd5475e9a1c954c2f9139c407c71 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -21,6 +21,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/opendaylight-infra-cleanup-stale-stacks.sh b/jjb/opendaylight-infra-cleanup-stale-stacks.sh
index 7cd4b5887a84f642d9370eb3312aca2b9b32b152..db2390bdf1c42ecdb717479f81f90b334722900e 100644 (file)
--- a/jjb/opendaylight-infra-cleanup-stale-stacks.sh
+++ b/jjb/opendaylight-infra-cleanup-stale-stacks.sh
@@ -11,7 +11,7 @@ pip freeze
 #########################
 # Fetch stack list before fetching active builds to minimize race condition
 # where we might be try to delete stacks while jobs are trying to start
-OS_STACKS=($(openstack --os-cloud rackspace stack list \
+OS_STACKS=($(openstack stack list \
             -f json -c "Stack Name" -c "Stack Status" \
             --property "stack_status=CREATE_COMPLETE" \
             --property "stack_status=DELETE_FAILED" \
@@ -40,6 +40,6 @@ for stack in "${OS_STACKS[@]}"; do
         continue
     else
         echo "Deleting orphaned stack: $stack"
-        openstack --os-cloud rackspace stack delete --yes "$stack"
+        openstack stack delete --yes "$stack"
     fi
 done

diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh
index 99e9dc7e57591f227685fae47efcd70a1d93c99d..d6801239f6b0b843889608bd2fda9c8e95584916 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -31,10 +31,10 @@ function copy-ssh-keys-to-slave() {
 
 # Print the Stack outputs parameters so that we can identify which IPs belong
 # to which VM types.
-openstack --os-cloud rackspace stack show -c outputs "$STACK_NAME"
+openstack stack show -c outputs "$STACK_NAME"
 
 # shellcheck disable=SC2006
-ADDR=(`openstack --os-cloud rackspace stack show -f json -c outputs "$STACK_NAME" | \
+ADDR=(`openstack stack show -f json -c outputs "$STACK_NAME" | \
        jq -r '.outputs[] | \
               select(.output_key | match("^vm_[0-9]+_ips\$")) | \
               .output_value | .[]'`)

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 3a105144081b831bc6587ef23aa1de7e75a804e9..ae190704da87856fb134395bf516ef175d378638 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -16,17 +16,17 @@ STACK_RETRIES=3  # Number of times to retry creating a stack before fully giving
 STACK_SUCCESSFUL=false
 # seq X refers to waiting for X minutes for OpenStack to return
 # a status that is not CREATE_IN_PROGRESS before giving up.
-openstack --os-cloud rackspace limits show --absolute
-openstack --os-cloud rackspace limits show --rate
+openstack limits show --absolute
+openstack limits show --rate
 echo "Trying up to $STACK_RETRIES times to create $STACK_NAME."
 for try in $(seq $STACK_RETRIES); do
     # shellcheck disable=SC1083
-    openstack --os-cloud rackspace stack create --timeout "$OS_TIMEOUT" -t {stack-template} -e "$WORKSPACE/opendaylight-infra-environment.yaml" --parameter "job_name=$VM_NAME" --parameter "silo=$SILO" "$STACK_NAME"
-    openstack --os-cloud rackspace stack list
+    openstack stack create --timeout "$OS_TIMEOUT" -t {stack-template} -e "$WORKSPACE/opendaylight-infra-environment.yaml" --parameter "job_name=$VM_NAME" --parameter "silo=$SILO" "$STACK_NAME"
+    openstack stack list
     echo "$try: Waiting for $OS_TIMEOUT minutes to create $STACK_NAME."
     for i in $(seq $OS_TIMEOUT); do
         sleep 60
-        OS_STATUS=$(openstack --os-cloud rackspace stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
+        OS_STATUS=$(openstack stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
         echo "$i: $OS_STATUS"
 
         case "$OS_STATUS" in
@@ -37,20 +37,20 @@ for try in $(seq $STACK_RETRIES); do
             ;;
             CREATE_FAILED)
                 echo "ERROR: Failed to initialize infrastructure. Deleting stack and possibly retrying to create..."
-                openstack --os-cloud rackspace stack list
-                openstack --os-cloud rackspace stack delete --yes "$STACK_NAME"
-                openstack --os-cloud rackspace stack show "$STACK_NAME"
+                openstack stack list
+                openstack stack delete --yes "$STACK_NAME"
+                openstack stack show "$STACK_NAME"
                 # after stack delete, poll for 10m to know when stack is fully removed
                 # the logic here is that when "stack show $STACK_NAME" does not contain $STACK_NAME
                 # we assume it's successfully deleted and we can break to retry
                 for j in $(seq 20); do
                     sleep 30;
-                    STACK_SHOW=$(openstack --os-cloud rackspace stack show "$STACK_NAME")
+                    STACK_SHOW=$(openstack stack show "$STACK_NAME")
                     echo "$j: $STACK_SHOW"
                     if [[ $STACK_SHOW == *"DELETE_FAILED"* ]]; then
                         echo "stack delete failed. trying to stack abandon now"
-                        openstack --os-cloud rackspace stack abandon "$STACK_NAME"
-                        STACK_SHOW=$(openstack --os-cloud rackspace stack show "$STACK_NAME")
+                        openstack stack abandon "$STACK_NAME"
+                        STACK_SHOW=$(openstack stack show "$STACK_NAME")
                         echo "$STACK_SHOW"
                     fi
                     if [[ $STACK_SHOW != *"$STACK_NAME"* ]]; then
@@ -82,7 +82,7 @@ for try in $(seq $STACK_RETRIES); do
 done
 
 # capture stack info in console logs
-openstack --os-cloud rackspace stack show "$STACK_NAME"
+openstack stack show "$STACK_NAME"
 
 if ! $STACK_SUCCESSFUL; then
     exit 1

diff --git a/jjb/opendaylight-infra-update-image-list.sh b/jjb/opendaylight-infra-update-image-list.sh
index 33aba011f00850d4d1088be0e9bcdafe65b5361e..871bdd5aa58db2ae327515e2dadc68bd736f3df7 100644 (file)
--- a/jjb/opendaylight-infra-update-image-list.sh
+++ b/jjb/opendaylight-infra-update-image-list.sh
@@ -13,7 +13,7 @@ EOF
 # Blank line before EOF is on purpose to ensure there is spacing.
 
 IFS=$'\n'
-IMAGES=($(openstack --os-cloud odlpriv image list --public -f value -c Name))
+IMAGES=($(openstack image list --public -f value -c Name))
 for i in "${IMAGES[@]}"; do
     echo "* $i" >> "$WORKSPACE/docs/cloud-images.rst"
 done

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
index e3a4ca1522b90860e6bd2e76c0d2e38bd694708f..d5d9eff14a04a046794e36162bd95f9f9084ee97 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
@@ -38,7 +38,7 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125'
 
     # Plot Info
     01-plot-title: 'Flow Add rate'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
index eb0dea272cc2e10a1a4f9f91fc2c80365352ff2a..5bfe2e28b32a7cd22e8aaf852c79d52156e58544 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
@@ -38,7 +38,7 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2000'
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125'
 
     # Plot Info
     01-plot-title: 'Flow Add rate'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
index 0e5682242d0d7feed9fa3bc38c7cfa0a191a5f36..7fe6ed19de7eef3152a082b3c92874679c899184 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
@@ -35,7 +35,7 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:64000'
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:100000'
 
     # Plot Info
     01-plot-title: 'Flow Add rate'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
index cbb77b890eaaf128e89b7cfad412a98bdef09f16..3b0b342dcd13f239dbce9d1ca8fc3b1574e9dedd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
@@ -36,7 +36,7 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:64000'
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count:100000'
 
     # Plot Info
     01-plot-title: 'Flow Add rate'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index 78e76ad51ea59b4a8c0adfb85b665641fac51fd8..5dfec9d0e6fe6c8aa70de93ccfedf92f3c506628 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -28,7 +28,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v SWITCHES:3'
 
     # mininet image
     tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
index 60b898559bb9bf41ef48fceb5894c8423d9120f8..74b50e5d69f54acb3e82dc11d41e54410997b55e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
@@ -20,19 +20,21 @@
       - only:
           scope: 'only'
 
+    # Job images
+    odl_system_flavor: '8 GB General Purpose v1'
+
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui'
 
     # Robot custom options
-    robot-options: '-v flnr:50000'
+    robot-options: '-v flnr:64000 -v swnr:32 -v fpr:200'
 
     # Plot Info
-    01-plot-title: 'Flows (100k) Setup Time'
-    01-plot-yaxis: '[s]'
-    01-plot-group: 'Config Performance'
-    01-plot-data-file: 'flows_setup_time.csv'
-
-    02-plot-title: 'REST setup rate (for 100k flows)'
-    02-plot-yaxis: 'setup time[s], req[flows/s]'
-    02-plot-group: 'Performance Rate'
-    02-plot-data-file: 'flows_install_rate.csv'
+    01-plot-title: 'Stats Collection Rate'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Stats Collection Performance'
+    01-plot-data-file: 'stats_rate.csv'
+    02-plot-title: 'Stats Collection Time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'Stats Collection Performance'
+    02-plot-data-file: 'stats_time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index a6697cd1423a4036d954d4b7c1124f766bb0ae95..68703fc769e310a56b6426c252288a385983e02b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -25,19 +25,22 @@
       - only:
           scope: 'only'
 
+    # Job images
+    odl_system_flavor: '8 GB General Purpose v1'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'
+
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui'
 
     # Robot custom options
-    robot-options: '-v flnr:50000'
+    robot-options: '-v flnr:100000 -v swnr:32 -v fpr:200'
 
     # Plot Info
-    01-plot-title: 'Flows (100k) Setup Time'
-    01-plot-yaxis: '[s]'
-    01-plot-group: 'Config Performance'
-    01-plot-data-file: 'flows_setup_time.csv'
-
-    02-plot-title: 'REST setup rate (for 100k flows)'
-    02-plot-yaxis: 'setup time[s], req[flows/s]'
-    02-plot-group: 'Performance Rate'
-    02-plot-data-file: 'flows_install_rate.csv'
+    01-plot-title: 'Stats Collection Rate'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Stats Collection Performance'
+    01-plot-data-file: 'stats_rate.csv'
+    02-plot-title: 'Stats Collection Time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'Stats Collection Performance'
+    02-plot-data-file: 'stats_time.csv'

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 7ca6e65cf339afb0c271b64b8afc025ba0230bfc..aad0b09e6d6d0693d9eeabf05b6bf8182c7fd98c 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -51,6 +51,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -96,6 +97,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 65a9d4e473939a632f841f54cbb79a68a50fadd6..f0eaa9946906a9d19a9152c055849482925f4d27 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -114,6 +114,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 0725dbf9809bc40bf50f5bfa287661b79f1fdfdb..96ef8d750367efaa02d87a634ce111ba2cd61e3c 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -20,6 +20,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 9be194a7bbe5bd0ce0cdb4ecca195c9827be3fa4..16cfd77beb6ad50bcad9075e9dccc5c4ad333dd9 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -33,6 +33,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -67,6 +68,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -119,6 +121,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -164,6 +167,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -203,6 +207,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -248,6 +253,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -283,6 +289,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -368,6 +375,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 4367a42dae13dba813d70fa7d7046373b0be268b..35a6065173ed4b6e929b0aaff3af975be7198ae8 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -38,6 +38,7 @@
     archive-artifacts: ''
     branch: master
     distribution_branch: '$GERRIT_BRANCH'
+    os-cloud: rackspace
 
     # Distribution bundle URL
     bundleurl: 'last'
@@ -67,8 +68,15 @@
     verify-stream: 'boron'
     verify-jdkversion: 'openjdk8'
 
-    # In case a CSIT job is merged without Java version specified
+    # Maven / Java
     jdk: 'openjdk8'
+    opendaylight-infra-mvn-opts: |
+        --show-version
+        --batch-mode
+        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+        -Djenkins
+        -Dmaven.repo.local=/tmp/r
+        -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 
     # Python
     toxdir: ''
@@ -143,6 +151,7 @@
         aaa-csit-1node-idmlite-only-carbon,
         aaa-csit-1node-keystone-all-carbon,
         aaa-csit-1node-keystone-only-carbon,
+        aaa-csit-1node-tls-only-carbon,
         alto-csit-1node-setup-all-carbon,
         alto-csit-1node-setup-only-carbon,
         armoury-csit-1node-basic-all-carbon,
@@ -158,6 +167,8 @@
         bgpcep-csit-3node-periodic-bgpclustering-all-carbon,
         bgpcep-csit-3node-periodic-bgpclustering-ha-only-carbon,
         bgpcep-csit-3node-periodic-bgpclustering-only-carbon,
+        bier-csit-1node-basic-all-carbon,
+        bier-csit-1node-basic-only-carbon,
         capwap-csit-1node-ac-all-carbon,
         capwap-csit-1node-ac-only-carbon,
         centinel-csit-1node-basic-all-carbon,
@@ -316,6 +327,8 @@
         sxp-csit-1node-topology-only-carbon,
         sxp-csit-3node-periodic-clustering-all-carbon,
         sxp-csit-3node-periodic-clustering-only-carbon,
+        sxp-csit-3node-periodic-routing-all-carbon,
+        sxp-csit-3node-periodic-routing-only-carbon,
         topoprocessing-csit-1node-topology-operations-all-carbon,
         topoprocessing-csit-1node-topology-operations-only-carbon,
         tsdr-csit-1node-cassandra-datastore-only-carbon,
@@ -517,7 +530,6 @@
         topoprocessing-csit-1node-topology-operations-all-boron,
         topoprocessing-csit-1node-topology-operations-only-boron,
         tsdr-csit-1node-cassandra-datastore-only-boron,
-        tsdr-csit-1node-elasticsearch-datastore-only-boron,
         tsdr-csit-1node-hbase-datastore-all-boron,
         tsdr-csit-1node-hbase-datastore-only-boron,
         tsdr-csit-1node-hsqldb-datastore-all-boron,
@@ -662,7 +674,6 @@
         topoprocessing-csit-1node-topology-operations-all-beryllium,
         topoprocessing-csit-1node-topology-operations-only-beryllium,
         tsdr-csit-1node-cassandra-datastore-only-beryllium,
-        tsdr-csit-1node-elasticsearch-datastore-only-beryllium,
         tsdr-csit-1node-hbase-datastore-all-beryllium,
         tsdr-csit-1node-hbase-datastore-only-beryllium,
         tsdr-csit-1node-hsqldb-datastore-all-beryllium,

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 25eb92acdd2a472f0acb72832d81f2dfcd2fec9a..cc3063ae1920d5bcd5c9c8d595b7ff25b979df40 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -100,6 +100,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -157,6 +158,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -224,6 +226,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -269,6 +272,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -329,6 +333,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -372,6 +377,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: odlpriv
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -420,6 +426,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -462,6 +469,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -540,6 +548,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 5be34b1f2bb2441e2ce5eb8e300e421ca77fc2be..85ca5509393c732de8094986ae963fb5f4fdf7f7 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -41,6 +41,12 @@
           name: STACK_NAME
           default: '$JOB_NAME-$BUILD_NUMBER'
           description: "Used by Heat to generate a unique stack & vm name"
+      - string:
+          name: OS_CLOUD
+          default: '{os-cloud}'
+          description: |
+              The name of a cloud configuration in clouds.yaml.
+              https://docs.openstack.org/developer/python-openstackclient/
 
 - parameter:
     name: build-tag

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f6b172c03365602631ef202eab832245766b80ca..cc23be0219e43d6e2451f63c5aef9bade1e4d71d 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -19,6 +19,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -43,12 +44,10 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
+          goals: |
               clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
@@ -87,6 +86,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -172,6 +172,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -198,7 +199,9 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
-          goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+          goals: |
+              {mvn-goals}
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -241,6 +244,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -271,14 +275,11 @@
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
       maven-name: 'mvn33'
-      goals: >
+      goals: |
           {mvn-goals}
-          -V -B
-          -Djenkins
           -Dmerge
           -Dstream={stream}
-          -Dmaven.repo.local=/tmp/r
-          -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          {opendaylight-infra-mvn-opts}
       maven-opts: '{mvn-opts}'
       settings: '{mvn-settings}'
       settings-type: cfp
@@ -352,6 +353,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -380,13 +382,10 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
-          goals: >
+          goals: |
               {mvn-goals}
-              -V -B
-              -Djenkins
               -Dsonar
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           maven-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -398,13 +397,11 @@
           # We should switch to the recommended configuration of sonar once
           # JJB adds support for configurating the Sonar wrapper:
           #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
-          goals: >
+          goals: |
               sonar:sonar
-              -V -B -Djenkins
               -Dsonar
               -Dsonar.host.url=https://sonar.opendaylight.org
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           maven-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -436,6 +433,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -484,12 +482,11 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: validate-pom.xml
-          goals: >
+          goals: |
               clean install dependency:tree
-              -V -B -T1.5C -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -T1.5C
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
           settings: 'autorelease-settings'
@@ -499,12 +496,10 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
+          goals: |
               clean validate
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
@@ -542,6 +537,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -570,12 +566,10 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: '{mvn-version}'
-          goals: >
-              {mvn-goals} -V -B
-              -Djenkins
+          goals: |
+              {mvn-goals}
               -Dstream={stream}
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 66bdd8b9de1136f47a58029ee4d5de3076cb823a..802448ceab75de9fbb9046c7dd0f7e973895463a 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -15,6 +15,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -79,6 +80,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -138,6 +140,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -153,6 +156,8 @@
             - 'origin/$GERRIT_BRANCH'
           skip-tag: true
           choosing-strategy: 'gerrit'
+          submodule:
+            recursive: true
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -246,6 +251,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -299,6 +305,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 11d729d2a4ed7dd55eec5bf6fe87940279a6fccb..d61f6b79baa4550a407f1c7f2159e343f178e1f3 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -37,6 +37,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
new file mode 100644 (file)
index 0000000..c32e756
--- /dev/null
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -0,0 +1,32 @@
+---
+- project:
+    name: sxp-csit-routing
+    jobs:
+      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'sxp'
+
+    # The functionality under test
+    functionality: 'routing'
+
+    # Project branches
+    stream:
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+
+    install:
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route'
+
+    # Tools VMs:
+    tools_system_count: 2
+
+    # Robot custom options:
+    robot-options: ''

diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
index dc41814f14b4fb5aa3d1a99e668dc28fc0050f0e..974b5594aa5fe4c91be7b362f01d81c2cda79ad9 100644 (file)
--- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml
+++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml
@@ -16,12 +16,6 @@
       - carbon:
           branch: 'master'
           jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
 
     install:
       - only:

diff --git a/packer/provision/robot.sh b/packer/provision/robot.sh
index 6eafe83e64627b810c5d1cda95878d77cb0b12cf..13bfa219ea3fe5a895d794f7ed26b207ce020b29 100644 (file)
--- a/packer/provision/robot.sh
+++ b/packer/provision/robot.sh
@@ -8,7 +8,14 @@ set -xeu -o pipefail
 # Install minimal python requirements to get virtualenv going
 # Additional python dependencies should be installed via JJB configuration
 # inside project jobs using a virtualenv setup.
-yum install -y python-{devel,setuptools,virtualenv} @development
+yum install -y @development \
+    python-devel \
+    python-setuptools \
+    python-virtualenv
+
+# TODO: Move docker-py and netaddr to virtualenv in the csit jobs.
+yum install -y python-docker-py \
+    python-netaddr
 
 # Install dependencies for robotframework and robotframework-sshlibrary
 # installed elsewhere