Merge "Add job to delete stale nodes older than 24H on RS"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Fri, 26 May 2017 15:20:53 +0000 (15:20 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 26 May 2017 15:20:53 +0000 (15:20 +0000)
108 files changed:
docs/cloud-images.rst
docs/jenkins.rst
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/armoury/armoury-csit-basic.yaml [deleted file]
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
jjb/autorelease/include-raw-autorelease-release-versions.sh
jjb/autorelease/version-bump.sh [new file with mode: 0644]
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman-csit-model.yaml [deleted file]
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/distribution/distribution.yaml
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
jjb/integration/include-raw-integration-start-cluster-run-test.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration4-templates.yaml
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.yaml
jjb/opendaylight-infra-cleanup-old-images.sh
jjb/opendaylight-infra-cleanup-stale-stacks.sh
jjb/opendaylight-infra-push-gerrit-patch.sh
jjb/opendaylight-infra-stack.sh
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packaging/include-raw-test-deb.sh
jjb/packaging/include-raw-test-puppet.sh
jjb/packaging/packaging.yaml
jjb/packaging/puppet.yaml
jjb/packetcable/packetcable.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangtools/yangtools.yaml
packer/provision/mininet-ovs-2.5.sh
tox.ini

index 58beb477bc3152d1d4de9086360337acdb7c4755..75631bed7706ca3ed7e36e2efb06974759f18977 100644 (file)
@@ -40,4 +40,5 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 LTS Trusty Tahr (cloudimg)
 * Ubuntu 16.04 - gbp - 20170308-0321
 * Ubuntu 16.04 - mininet-ovs-25 - 20170308-0230
+* Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740
 * Ubuntu 16.04 LTS (2016-05-03 cloudimg)
index cb15c2ec1acbe4a7e832ab0892a3ac754f408362..4c5d3f0b58bd00260a3f58f7c343561e35139f07 100644 (file)
@@ -27,10 +27,16 @@ in the jenkins-master_ silo and this can be achieved by simply creating a
 
 .. code-block:: bash
 
-    git clone https://git.opendaylight.org/gerrit/releng/builder
+    git clone --recursive https://git.opendaylight.org/gerrit/releng/builder
     cd builder
     mkdir jjb/<new-project>
 
+.. note:
+
+    releng/global-jjb is a submodule of releng/builder repository which
+    requires a git submodule update --init or using --recursive with git clone.
+    `releng-global-jjb`_
+
 Where <new-project> should be the same name as your project's git repo in
 Gerrit. So if your project is called "aaa" then create a new jjb/aaa directory.
 
@@ -432,7 +438,7 @@ First, clone the latest version of the `releng-builder-repo`_.
 
 .. code-block:: bash
 
-    $ git clone https://git.opendaylight.org/gerrit/p/releng/builder.git
+    $ git clone --recursive https://git.opendaylight.org/gerrit/p/releng/builder.git
 
 Before actually installing JJB and its dependencies, make sure you've `created
 and activated <Virtual Environments_>`_ a virtual environment for JJB.
@@ -802,7 +808,7 @@ example is provided by releng/builder at `example-jenkins.ini`_.
 .. code-block:: bash
 
     # If you don't have RelEng/Builder's repo, clone it
-    $ git clone https://git.opendaylight.org/gerrit/p/releng/builder.git
+    $ git clone --recursive https://git.opendaylight.org/gerrit/p/releng/builder.git
     # Make a copy of the example JJB config file (in the builder/ directory)
     $ cp jenkins.ini.example jenkins.ini
     # Edit jenkins.ini with your username, API token and ODL's sandbox URL
@@ -959,6 +965,7 @@ If `using Docker <JJB Docker image_>`_:
 .. _releng-wiki: https://wiki.opendaylight.org/view/RelEng:Main
 .. _releng-builder-gerrit: https://git.opendaylight.org/gerrit/#/admin/projects/releng/builder
 .. _releng-builder-repo: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=summary
+.. _releng-global-jjb: https://gerrit.linuxfoundation.org/infra/#/q/project:releng/global-jjb
 .. _releng-builder-wiki: https://wiki.opendaylight.org/view/RelEng/Builder
 .. _streams-design-background: https://lists.opendaylight.org/pipermail/release/2015-July/003139.html
 .. _spinup-scripts: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=jenkins-scripts
index 010cc886df2d8a2e73dbaadcd0b8073e74220b07..137b7ff43e7f07955c857ed1b0c183db1fbe0350 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 99e2fe1d3cbb2fa371f2bd8c06421a543ebaf25f..8615853d10801b973b256b082f675f724f546e6a 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
deleted file mode 100644 (file)
index 9bfd6f8..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: armoury-csit-basic
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
-
-    # The project name
-    project: 'armoury'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-armoury-workloadmanager
-
-    # Robot custom options
-    robot-options: ''
index fd36010d1dc770fc003a8161034b447974c96588..f216efb5c1ca59b8a1d6cf538190819cd3e833bf 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 7b6b0e2046808b4d59cc9ad561530ef71a782453..288209521f886aeb5d185b97201354e90ad60e41 100644 (file)
 - builder:
     name: autorelease-generate-release-patches
     builders:
-      - shell: !include-raw: include-raw-autorelease-release-versions.sh
+      - shell: !include-raw:
+          - ../global-jjb/shell/lftools-install.sh
+          - include-raw-autorelease-release-versions.sh
 
 - builder:
     name: autorelease-get-integration-test-variables
     name: autorelease-generate-release-notes
     builders:
       - shell: |
-          # TODO: Remove this condition once stable/beryllium is no longer
-          #       officially maintained.
-          if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then
-              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
+          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
 
 - publisher:
index e61a0fe5a99bb9afebc6dfc42206dafde54690bf..c00cfb15c6e6e138382877cb36b822d9bc3a26af 100644 (file)
@@ -3,7 +3,7 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
-      - 'autorelease-generate-release-notes-{stream}'
+      - autorelease-version-bump-{stream}
 
     stream:
       - nitrogen:
@@ -11,6 +11,7 @@
           branch: 'master'
           jdk: 'openjdk8'
           integration-test: nitrogen
+          karaf-version: karaf3
       - carbon:
           next-release-tag: Carbon
           branch: 'stable/carbon'
         patches.tar.gz
         error.log.gz
 
+
+- project:
+    name: autorelease-release-notes
+    jobs:
+      - 'autorelease-generate-release-notes-{stream}'
+
+    stream:
+      - nitrogen:
+          branch: 'master'
+          jdk: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jdk: 'openjdk8'
+      - boron:
+          branch: 'stable/boron'
+          jdk: 'openjdk8'
+
+    project: 'releng/autorelease'
+    archive-artifacts: >
+        **/*.log
+
+
 ###
 # TODO: Remove this job once guava21 testing is complete
 ###
index 284fdef09c0635d96479e9cabca753b4b42bd26c..4894c2257cf7685d61cd93580ae1705e5f167e24 100644 (file)
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
 
+- job-template:
+    name: autorelease-version-bump-{stream}
+    project-type: freestyle
+    node: centos7-autorelease-4c-16g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - lf-infra-parameters:
+          project: releng/autorelease
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+      - string:
+          name: RELEASE_TAG
+          default: '{next-release-tag}'
+          description: |
+              Release that is being version bumped.
+              Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2...
+      - bool:
+          name: DRY_RUN
+          default: true
+          description: |
+              If DRY_RUN is enabled modifications are not published to Gerrit.
+      - maven-exec:
+          maven-version: mvn33
+
+    scm:
+      - lf-infra-gerrit-scm:
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-recursive: true
+          choosing-strategy: default
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 240
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+
+    builders:
+      # force jenkins install of maven version before any shell scripts use it
+      - maven-target:
+          maven-version: mvn33
+          goals: '-version'
+          settings: autorelease-settings
+          settings-type: cfp
+          global-settings: odl-global-settings
+          global-settings-type: cfp
+      - autorelease-cfp
+      - shell: !include-raw-escape:
+          - ../global-jjb/shell/lftools-install.sh
+          - version-bump.sh
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
     name: 'autorelease-generate-release-notes-{stream}'
index b90d959a788a8e96db8917d475239a3db424980c..941106e5a8a507a2d06b977dc8bfff0b2b16029a 100644 (file)
@@ -23,6 +23,7 @@ STAGING_REPO_ID=$(grep "Created staging repository with ID" "$WORKSPACE/deploy-s
 BUNDLE_URL="${NEXUSURL}/${STAGING_REPO_ID}/org/opendaylight/integration/${KARAF_ARTIFACT}/${VERSION}/${KARAF_ARTIFACT}-${VERSION}.zip"
 echo STAGING_REPO_ID="$STAGING_REPO_ID" >> "$WORKSPACE/variables.prop"
 echo BUNDLE_URL="$BUNDLE_URL" >> "$WORKSPACE/variables.prop"
+echo KARAF_VERSION="$KARAF_VERSION" >> "$WORKSPACE/variables.prop"
 echo "BUNDLE_URL: ${BUNDLE_URL}"
 
 # Copy variables.prop to variables.jenkins-trigger so that the end of build
index 0b38f0ee081549f07041083a0cdd8644b1b80c1d..e84b8caa2745012980dc62da27377db49b43224e 100644 (file)
 # RELEASE_TAG=Beryllium-SR1  # Example
 # RELEASE_BRANCH=stable/beryllium  # Example
 
-LFTOOLS_DIR="$WORKSPACE/.venv-lftools"
-if [ ! -d "$LFTOOLS_DIR" ]
-then
-    virtualenv "$LFTOOLS_DIR"
-    # shellcheck disable=SC1090
-    source "$LFTOOLS_DIR/bin/activate"
-    pip install --upgrade pip
-    pip freeze
-    pip install lftools
-fi
-# shellcheck disable=SC1090
-source "$LFTOOLS_DIR/bin/activate"
-
 # Directory to put git format-patches
 PATCH_DIR="$WORKSPACE/patches"
 
diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
new file mode 100644 (file)
index 0000000..15b7c87
--- /dev/null
@@ -0,0 +1,78 @@
+#!/bin/bash
+# @License EPL-1.0 <http://spdx.org/licenses/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 performs version bumping activities for an ODL release.
+echo "---> version-bump.sh"
+
+mkdir -p "$WORKSPACE/archives"
+LOG_FILE="$WORKSPACE/archives/version-bump.log"
+BRANCH="$GERRIT_BRANCH"
+
+# Ensure we fail the job if any steps fail.
+set -eu -o pipefail
+
+git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+git submodule foreach git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
+
+# Check if git state is clean
+git status
+
+lftools version release "$RELEASE_TAG"
+lftools version bump "$RELEASE_TAG"
+
+git submodule foreach "git commit -asm 'Bump versions by x.y.(z+1)'"
+# Only submodules need to be bumped, we can ignore autorelease's bump information
+git checkout -f
+
+# Generate git patches
+patch_dir="$WORKSPACE/archives/patches/version-bump"
+mkdir -p "$patch_dir"
+for module in $(git submodule | awk '{ print $2 }')
+do
+    pushd "$module"
+    git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
+    git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
+    popd
+done
+
+# Verify
+{
+    echo "----> Verify version bump"
+    git submodule foreach git show HEAD
+    git show HEAD
+    find . -name pom.xml -print0 | xargs -0 grep "$RELEASE_TAG" || true
+    git status
+    ls "$patch_dir"
+} | tee -a "$LOG_FILE"
+
+# Push
+if [ "$DRY_RUN" = "false" ]
+then
+    # Run a build here! Should be safe to run mvn clean deploy as nothing should be
+    # using the version bumped versions just yet.
+    ./scripts/fix-relativepaths.sh
+    "$MVN" clean deploy -Pq \
+    -s "$SETTINGS_FILE" \
+    -gs "$GLOBAL_SETTINGS_FILE" \
+    -DaltDeploymentRepository="opendaylight-snapshot::default::https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot" \
+    --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
+
+    # Push up patches last, as long as nothing failed.
+    git submodule foreach "git remote add gerrit '$GIT_URL/$PROJECT'"
+    git submodule foreach "git review --yes -t '${RELEASE_TAG}' || true"
+fi
+
+echo "Version bumping complete."
index cf480b8d9c135fdf522ae608f7db4646d8e4ec64..0fa804008a059deae31578ac40122cfe57cecd4c 100644 (file)
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-bgpcep-bgp
 
     # Built timeout
index 1ba83774295e024c6238db703906fd8284de36a1..4091f0f639cd337de58519fc5d28466e138994fa 100644 (file)
@@ -37,7 +37,7 @@
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-bgp,odl-netconf-clustered-topology'
+    install-features: 'odl-restconf-noauth,odl-bgpcep-bgp,odl-netconf-clustered-topology'
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
index f7792a3a9b973ea5db5ef1f6dcc3530f36c56238..65fe3a3d85e47288ac918ab32fa859f4f8829a45 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -37,7 +38,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index ac30ab545f47bbae0b8a87a3320fdf6aeb78d666..bb57f39ea3d2869ca7f84fc8f24ea72bb073fe66 100644 (file)
@@ -24,7 +24,7 @@
     # TODO: Delete the following if suites are compatible with Boron again.
     verify-stream: 'carbon'
     # TODO: Remove the lines above and below when carbon becomes the default scit-verify stream.
-    verify-branch: 'carbon'
+    verify-branch: 'stable/carbon'
     # TODO: Update the line above when stable/carbon is created.
 
     install:
index 12ad1076a07286abc514d3edbcb4e2a50abf849e..f8383a8b8c85e012784d0490a059fab402e5faad 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index a99c63d1a7052b6f93543068e9e697ffa0171834..139bff0e8e4860fbf1a20fc974e1192463cf4c36 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 95a20a7cfe9e0cfc5336f1d420e23e75afd227c6..f1d3fb98caaf6e36bdfb174ec077a08d196d4349 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index fcbbae62b45c3085f90b087381c258262116bfb7..4ac5b1b5a89cd4a6b68e2c3ada8ad3459a66c66d 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index ba63cef0b2b21476d69c46ac808f750f0ae5f755..8778cf5f32e30e5075bd4b4f0741f48023126f3b 100644 (file)
@@ -40,7 +40,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Robot custom options
index dcb89b3501c50e77b4e08ba1eae9f4cb0397b57b..40dc8c32ef55aef1f6e9e39cd86bc56bf32fd1a0 100644 (file)
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout
index 599c29b3a13715db0abe1ba7da78cec4734dd198..cc5101f4aefb6fb33981ee768adf333474c2d1e4 100644 (file)
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout
index 76edf60104e8d455797918f476a94cdaefd8e439..4c1b0afd0914a23ea6d12e4a80112d3fec1c18f3 100644 (file)
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout
index 6956ceb2c038efc6f7c63eb1108a1216cd0d4c9d..bd0bbc154aed6a7df0fe8fe34c62a9dad300aaf1 100644 (file)
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout
index 5a131a293ec30756818c5a88a7c04860e0a36cda..039c68410bf1d8ff5fc0bdec9a72df97d6d097f0 100644 (file)
@@ -26,7 +26,7 @@
 
     # Features to install
     install-features: >
-        odl-restconf,
+        odl-restconf-noauth,
         odl-clustering-test-app
 
     # Built timeout
index 185482da260b98072587eef850239bd3ddf73ce1..8d1679134a7ef33fe83dd34fe05d234da59430be 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index cd0cab21d0eb9805fa679008a7eee8473fe5663a..2330af7b7c285cb5ab7fbb894e4804ebd284b35f 100644 (file)
     # The functionality under test
     functionality: 'basic'
 
+    # Set trigger
+    trigger-jobs: '{project}-merge-{stream}'
+
     # Project branches
     stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
       - carbon:
-          branch: 'stable/carbon'
+          branch: 'master'
           jre: 'openjdk8'
           karaf-version: karaf3
           # yamllint disable-line rule:line-length
index 902fcacf84110ac129f90127db887d864f926c13..6fb143be4640119d18cb482204aa21b65de09eb5 100644 (file)
@@ -1,29 +1,4 @@
 ---
-- project:
-    name: daexim-nitrogen
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: nitrogen
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
-
 - project:
     name: daexim-carbon
     jobs:
@@ -35,7 +10,7 @@
     project: 'daexim'
     project-name: 'daexim'
     stream: carbon
-    branch: 'stable/carbon'
+    branch: 'master'
     karaf-version: karaf3
     jdk: openjdk8
     jdks:
index a6f1188fa3aca7025d1214def50117dfdb6e4469..97d50d454805a4746a86ac014dc88dfdca26a96c 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 00b31dc6677a1146ecb857bd6f6398273bfa051a..30568d2f1366e50e274f803823980ff77c585397 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 427fd1ba77e62f4303813b2f71627c26905f4809..e475941b8294279aba3d5ab57eac48a67917a509 100644 (file)
           jre: 'openjdk8'
           karaf-version: karaf3
 
+    # dluxapps started in Carbon project, so current verify with Boron is not working
+    verify-stream: 'carbon'
+    verify-branch: 'stable/carbon'
+
     install:
       - only:
           scope: 'only'
index aaaf1e7c3954ebc1ed4445eea5e49a3e06c845df..df544b9f710223d9741ce6c2c247fe25c83dd13c 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index f06c034e9c43d12eba1356e71ef56aa7e66d7219..3fd3f3ce263fb676a2d6860e2476f2f7de4481d1 100644 (file)
@@ -75,6 +75,7 @@
     # FIXME: Describe this job in docs/jenkins.rst
     name: 'docs-verify-rtd-{stream}'
     node: centos7-java-builder-2c-8g
+    concurrent: true
 
     project-type: freestyle
 
diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml
deleted file mode 100644 (file)
index 30db058..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: eman-csit-model
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
-
-    # The project name
-    project: 'eman'
-
-    # The functionality under test
-    functionality: 'model'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-eman-ui'
-
-    # Robot custom options
-    robot-options: ''
index d581efe2e457d73fb8b6682ca19c1add3e63fa43..7ae21fed1a493afa3ce27f881207525d3d954dae 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index cef10f4edc6c70f3177d541a647042c2c3c9b08a..ead4febb2d054465ba362937b6112dc2f5b21531 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 789356b9dfb194816de742af00386e59cc2f2cc9..6d8aede2ce0566895c83e3e2ce55fc628d5a2baf 100644 (file)
@@ -7,6 +7,7 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-validate-autorelease-{stream}'
 
     project: 'federation'
@@ -33,7 +34,6 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
 
index 53c2d7ab125a6cdb649024653460ba0799abd670..68a31279410b8212b3f7ae38ae789dbbf35f54ee 100644 (file)
@@ -5,12 +5,16 @@
       - '{project}-csit-3node-{functionality}-{install}-{stream}'
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
       - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-verify-3node-{functionality}'
+
 
     # The project name
     project: 'genius'
 
     # The functionality under test
-    functionality: 'genius'
+    functionality:
+      - 'upstream'
+      - 'gate'
 
     # Project branches
     stream:
index b4167143f0091f29dd1ed474c7aac561ee01fccd..666c4a37d4d6b6868433360b70539f5cbbcf7766 100644 (file)
@@ -32,5 +32,5 @@
 
       - genius:
           csit-list: >
-              genius-csit-1node-genius-only-{stream},
-              genius-csit-1node-genius-all-{stream}
+              genius-csit-1node-gate-only-{stream},
+              genius-csit-1node-gate-all-{stream}
index 5682d12e2579e3f3eb1430d367099721f092686c..50659e1460be24a6f5f1fd3fac127df1b6742ca0 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -36,7 +37,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 06ff6a7ef0a50695c273eb6ea35dece69a824d11..1f598940fa10007d71bf9f95bbc4568bdaad8b16 100644 (file)
@@ -40,9 +40,9 @@
           install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
 
     openstack:
-      - liberty:
-          openstack-branch: 'stable/liberty'
-          odl-ml2-branch: 'stable/liberty'
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
 
     schedule: 'H H * * *'
 
index 6b5b7805d2f3469de9cf1a461fe934ad8ff385e7..5df80371467eae3e3b9085ab6c874a4559f9e7fa 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -36,7 +37,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 2e8f863db8e2c2b414459015d6e7fdcff380251c..a8729cee54587b40fe7712de6523d23a11e6792d 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 97a2d5f678bc2df52401942898e765f120c111dc..004da6b48f70e7d13781b36bf9adf7a47dbb244b 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index e1f68aca986374a95e291afb34acf77977f46a3b..a7faae523294a5a8636a0e0c36573f62b9a5b1fb 100644 (file)
@@ -3,7 +3,7 @@
     name: distribution-csit-userfeatures
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit4-1node-{functionality}-{install}-carbon'
+      - '{project}-csit4-1node-{functionality}-{install}-nitrogen'
 
     # The project name
     project: 'distribution'
index d7a3b7e0d1fc30fe2d5803df7a9eacd1e131a1ef..7a6345f074fd4fa4ade0d9b4e9069f7d87faa077 100644 (file)
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
 
-# Delete these when Karaf 4 becomes Carbon default.
+# Delete these when Karaf 4 becomes Nitrogen default.
 
 # TODO: Is there a way to de-duplicate with generic template parts?
 
 - job-template:
-    name: 'distribution4-check-carbon'
+    name: 'distribution3-check-nitrogen'
     disabled: false
 
     project-type: freestyle
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: stable/carbon
-          refspec: refs/heads/stable/carbon
+          branch: master
+          refspec: refs/heads/master
           artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
       - maven-exec:
           maven-version: mvn33
 
       - integration-gerrit-scm:
           basedir: distribution
           refspec: '$GERRIT_REFSPEC'
-          branch: stable/carbon
+          branch: master
 
     wrappers:
       - opendaylight-infra-wrappers:
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
           project: '{project}'
-          branch: 'stable/carbon'
+          branch: 'master'
           files: '**'
 
     builders:
           maven-version: 'mvn33'
 
 - job-template:
-    name: 'distribution4-deploy-carbon'
+    name: 'distribution3-deploy-nitrogen'
     disabled: false
 
     project-type: freestyle
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts} **/*.hprof'
       - integration-distribution-branch:
-          branch: 'stable/carbon'
+          branch: 'master'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
 
     wrappers:
       - opendaylight-infra-wrappers:
           maven-version: 'mvn33'
 
 - job-template:
-    name: 'distribution4-offline-carbon'
+    name: 'distribution3-offline-nitrogen'
     disabled: false
 
     project-type: freestyle
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts} **/*.hprof'
       - integration-distribution-branch:
-          branch: 'stable/carbon'
+          branch: 'master'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
 
     wrappers:
       - opendaylight-infra-wrappers:
index b564431c69ea922b15b572dc9340fd397197709c..17712cca77a9157f568a2fdcc11655534c1cf29a 100644 (file)
       - opendaylight-infra-shiplogs:
           maven-version: 'mvn33'
 
-# Delete these when Karaf 4 becomes Carbon default.
+# Delete these when Karaf 4 becomes Nitrogen default.
 
 # TODO: Is there a way to de-duplicate with generic template parts?
 
 - job-template:
-    name: '{project-name}-distribution4-check-carbon'
+    name: '{project-name}-distribution3-check-nitrogen'
     disabled: false
 
     project-type: freestyle
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: '{project}'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - distribution-karaf-version:
-          karaf-version: karaf4
+          karaf-version: karaf3
       - maven-exec:
           maven-version: mvn33
 
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
       - integration-distribution-scm:
-          branch: 'stable/carbon'
+          branch: 'master'
 
     wrappers:
       - opendaylight-infra-wrappers:
       - gerrit-trigger-patch-submitted:
           server: '{server-name}'
           project: '{project}'
-          branch: 'stable/carbon'
+          branch: 'master'
           files: '**'
 
     builders:
index 9c58a98d5a848cf427e9aa68aa8daec727efb37e..057e71ce5d63d2851cd9e8fcc664506a2154aea0 100644 (file)
@@ -13,9 +13,9 @@
       - 'distribution-deploy-{stream}'
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
-      - 'distribution4-deploy-carbon'
-      - 'distribution4-offline-carbon'
-      - 'distribution4-check-carbon'
+      - 'distribution3-deploy-nitrogen'
+      - 'distribution3-offline-nitrogen'
+      - 'distribution3-check-nitrogen'
 
     project: integration/distribution
     project-name: distribution
index b20f1ad570c7203a58a3c14d0f100a1af4f38860..b08af74c471cdda55c5fb653f2c8559778434ce6 100644 (file)
@@ -238,11 +238,6 @@ done
 echo "Cool down for ${COOLDOWN_PERIOD} seconds :)..."
 sleep ${COOLDOWN_PERIOD}
 
-if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then
-   echo "Exiting without running tests to deploy openstack for testing"
-   exit
-fi
-
 echo "Generating controller variables..."
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
@@ -253,6 +248,11 @@ do
     ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log || true
 done
 
+if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then
+   echo "Exiting without running tests to deploy openstack for testing"
+   exit
+fi
+
 echo "Generating mininet variables..."
 for i in `seq 1 ${NUM_TOOLS_SYSTEM}`
 do
@@ -300,17 +300,26 @@ do
 done
 
 sleep 5
+# FIXME: Unify the copy process between various scripts.
+# TODO: Use rsync.
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     echo "Compressing karaf.log ${i}"
     ssh ${!CONTROLLERIP} gzip --best /tmp/${BUNDLEFOLDER}/data/log/karaf.log
     echo "Fetching compressed karaf.log ${i}"
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz"
     # TODO: Should we compress the output log file as well?
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+    echo "Fetch GC logs"
+    # FIXME: Put member index in filename, instead of directory name.
+    mkdir -p "gclogs-${i}"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/*.log" "gclogs-${i}/" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/*.log"
 done
 
+echo "Examine copied files"
+ls -lt
+
 true  # perhaps Jenkins is testing last exit code
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index c3e110fd5d5fdb15f559cfc5b68c339238723b61..a3a38778e844138469ffce1eb164b7aa7282c312 100644 (file)
@@ -370,6 +370,9 @@ set +e  # We do not want to create red dot just because something went wrong whi
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
+    echo "Lets's take the karaf thread dump again..."
+    KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep ${KARAF_ARTIFACT} | grep -v grep | tr -s ' ' | cut -f2 -d' '")
+    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log || true
     echo "killing karaf process..."
     ${SSH} "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 done
@@ -483,6 +486,13 @@ cd devstack
 git checkout $OPENSTACK_BRANCH
 EOF
 
+cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF
+sudo nova-manage cell_v2 map_cell0
+sudo nova-manage cell_v2 simple_cell_setup
+sudo nova-manage db sync
+sudo nova-manage cell_v2 discover_hosts
+EOF
+
 [ "$NUM_OPENSTACK_SITES" ] || NUM_OPENSTACK_SITES=1
 compute_index=1
 odl_index=1
@@ -636,6 +646,14 @@ do
         exit 1
     fi
 
+    # For Ocata, if we do not enable the n-cpu in control node
+    # We need to discover hosts manually and ensure that they are mapped to cells.
+    # reference: https://ask.openstack.org/en/question/102256/how-to-configure-placement-service-for-compute-node-on-ocata/
+    if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
+        scp ${WORKSPACE}/setup_host_cell_mapping.sh  ${!CONTROLIP}:/tmp
+        ${SSH} ${!CONTROLIP} "sudo bash /tmp/setup_host_cell_mapping.sh"
+    fi
+
     # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
     # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
     # of these libs that are not working for tempest.
index 997a6bd1d9d2e84a33195793a500208919e1e6ec..da99d6247bf60d725a6b120398d88cc674341faa 100644 (file)
@@ -145,10 +145,18 @@ do
     echo "Compressing karaf.log ${i}"
     ssh ${!CONTROLLERIP} gzip --best /tmp/${BUNDLEFOLDER}/data/log/karaf.log
     echo "Fetching compressed karaf.log ${i}"
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz"
-    # TODO: Gzip also these?
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz"
+    # TODO: Should we compress the output log file as well?
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+    echo "Fetch GC logs"
+    # FIXME: Put member index in filename, instead of directory name.
+    mkdir -p "gclogs-${i}"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/*.log" "gclogs-${i}/" && ssh ${!CONTROLLERIP} rm -f "/tmp/${BUNDLEFOLDER}/data/log/*.log"
 done
+
+echo "Examine copied files"
+ls -lt
+
 true  # perhaps Jenkins is testing last exit code
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index 1e9005cd4577218010f5cf60dbd8d771c08ac5ef..4c22732f8158c58e061c569100a0f0b077226fd4 100644 (file)
                 - compare-type: ANT
                   pattern: '{files}'
 
+# Macro: integration-csit-only
+# Operation: this macro sets a trigger on reverse job list
+# Used by: csit -only- job templates
+
+- trigger:
+    name: integration-csit-trigger
+    triggers:
+      - reverse:
+          jobs: '{jobs}'
+          result: 'success'
+
 # Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates
index b71eea9d5514b5e34a8d7c887c5819717d26fa86..40cd2f1114a3667a2f5b189b92b781ca72a0f765 100644 (file)
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
+    triggers:
+      # we need this for not SR projects
+      - integration-csit-trigger:
+          jobs: '{trigger-jobs}'
+
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
index 3ebdc7d55a36b42b7adfaa944c6d2382adec756c..75719880084a0d32bd329fa40aced5a38287e299 100644 (file)
     parameters:
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     builders:
       - trigger-builds:
           - project: '{csit-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
     parameters:
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     builders:
       - trigger-builds:
           - project: '{csit-sanity-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
     parameters:
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     triggers:
       - timed: '{schedule-weekly}'
       - trigger-builds:
           - project: '{csit-weekly-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
     parameters:
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
 
     triggers:
       - timed: '{schedule-high-frequency}'
       - trigger-builds:
           - project: '{csit-high-frequency-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
index b8ca58cd8d38ae4ab361f275b200f0823aba656c..3591d82bf77f846e66281e73994ab85a393e1369 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - job-template:
-    name: '{project}-csit4-1node-{functionality}-{install}-carbon'
+    name: '{project}-csit4-1node-{functionality}-{install}-nitrogen'
     # Keep synchronized with *-csit-* please.
     disabled: false
 
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
+      # Removing {kafka-version} will force this job to run in k4.
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
           project: 'integration/test'
-          branch: 'stable/carbon'
-          refspec: 'refs/heads/stable/carbon'
+          branch: 'master'
+          refspec: 'refs/heads/master'
           artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
-          branch: 'stable/carbon'
+          branch: 'master'
       - integration-distribution-stream:
-          stream: 'carbon'
+          stream: 'nitrogen'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - integration-controller-scope:
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-stream-test-plan:
-          stream-test-plan: '{project}-{functionality}-carbon.txt'
+          stream-test-plan: '{project}-{functionality}-nitrogen.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
           jdkversion: 'openjdk8'
-      - distribution-karaf-version:
-          karaf-version: karaf4
 
     scm:
       - integration-gerrit-scm:
@@ -86,7 +85,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-carbon-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-nitrogen-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-carbon-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit4-1node-{functionality}-{install}-nitrogen-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
index 63ae08f99415b645c8cd981bf2c3a6410a4897cf..5c81767b215811ffb8967f3c827aa0fb45fcf56d 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index a63e1e46c38571ce71944c9a99ed6dcd72479a4d..0dd6f35d6b0d683d35b89e35f3f82a8a563a2e61 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -36,7 +37,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index dfdeebce7c3b6618b46ff89618e5344b6d6d2985..83a935f3eae14a546a7e7d68e754737c81001bc0 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 02269be4ef1de684997fd1c1a4a53cd7fa66eabe..2ed9868a9cf6bb1d0eb6bb56e7b152c8aa62ce37 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -32,7 +33,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 5ac926ed61c83433a0273b5370a3d8f052966b5c..b73996b0e43d7ad195f5f0aff74fa287cfda7ec8 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index d4db1a5b29cc87330a6a6a1e15baf77719eb69b2..f717d6a9f226757a413b2acece4d5e2d48beed0f 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index e5c7bb2d75d65506d960bc0aa290b105ad496c9b..59e13535d5b01efd64fa61d546fb427d8c1c11e1 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 5c28e9ae9989e014c4009c697efa483dda66ebc2..d39b71b0f19bf04f3503af474e9c46b7724c043b 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 5dec7553cff2478f7061b4cabb7512eeaa26e80f..aeaa6bf468bc96db7496dd985dcc2724832b1b69 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 8a29a5066a0312013dcecd3659b0fc0ba0cfeb30..b61bd457f5e55a4537feafe125e9fc499a679d47 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 497d2d42b9d3c3c9c03ce0a11dc245c0a9ce80e6..a5d6460378896b5a3e023fa248797c6f039d09d3 100644 (file)
@@ -57,9 +57,7 @@
 
     tools_system_count: 2
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170406-0546'
-
-    odl_system_image: 'CentOS 7 - java-builder - 20170403-0948'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740'
 
     enable-networking-l2gw: 'yes'
 
index 23c4a80fb0e8bfc509022e95bddffed5b2bd0513..4e1ba2f688a4f4ae2ff9a96e30e6b2aadc1dd82d 100644 (file)
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
     security-group-mode: '{sg-mode}'
 
index aa91baf8cd64e027111e874e766c9524fb091201..e72b2ade41ca51ca913d5315588327b25e5961f9 100644 (file)
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
     public-bridge: 'br-ex'
index e9941c209bdf754111131a5722550d368a4da4e0..e2a79df84bd021e23b47dd5ae738e32ba114bdf3 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -37,7 +38,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 94e6cab88856aa246e8e9218948fd97cb650d937..4f44276fe95d323933628be23f36b4d6db825fa6 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -32,7 +33,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 22b31f3ace8343b8df7cb1ea9be692a9064d0453..b34994c21dc9a0f9a14a4014bacc45fcada430ed 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index d01ee081daa7e347628d22e8d420f9c5a0cda3dd..3ec53dc2e9ff8244f788f67bfa9f5be2116571ee 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 65e1bada21efe37bf9e8eb192f21e988548a6115..7a766aefba43ba27f5ac19ca1fe8058819a4dbaf 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 55704240683c8351dc77dea6be2fbcb186467b45..7076499bd90d133452dfc71bcf7d313acef69b44 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -32,7 +33,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 5aa4e5c0613e701bb09f39080974cdaf3f432893..d78a9bef35fa936baf09c8b7a700c496a97917e6 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 129ab133624cac2b8ac9d487a5cbd9363b317d3a..b3b28e1037914a20eb5502998654c0728e5c24e3 100644 (file)
@@ -1,16 +1,4 @@
 #!/bin/bash
-LFTOOLS_DIR="$WORKSPACE/.venv-lftools"
-if [ ! -d "$LFTOOLS_DIR" ]
-then
-    virtualenv "$LFTOOLS_DIR"
-    # shellcheck disable=SC1090
-    source "$LFTOOLS_DIR/bin/activate"
-    pip install --upgrade pip
-    pip install "lftools>=0.0.10"
-    pip freeze
-fi
-# shellcheck disable=SC1090
-source "$LFTOOLS_DIR/bin/activate"
 
 lftools openstack --os-cloud odlpriv-sandbox \
     image cleanup --hide-public=True \
index db2390bdf1c42ecdb717479f81f90b334722900e..d99938b3444dbbc09a741e9dc4305eba0c4334f9 100644 (file)
@@ -26,20 +26,49 @@ for silo in releng sandbox; do
     sleep 1  # Need to sleep for 1 second otherwise next line causes script to stall
     ACTIVE_BUILDS=(${ACTIVE_BUILDS[@]} $( \
         jq -r '.computer[].executors[].currentExecutable.url' "${silo}_builds.json" \
-        | grep -v null | awk -F'/' '{print $6 "-" $7}'))
+        | grep -v null | awk -F'/' '{print $4 "-" $6 "-" $7}'))
 done
 
 ##########################
 ## DELETE UNUSED STACKS ##
 ##########################
-# Search for stacks taht are not in use by either releng or sandbox silos and
+# Search for stacks that are not in use by either releng or sandbox silos and
 # delete them.
-for stack in "${OS_STACKS[@]}"; do
-    if [[ "${ACTIVE_BUILDS[@]}" =~ $stack ]]; then
+for STACK_NAME in "${OS_STACKS[@]}"; do
+    STACK_STATUS=$(openstack stack show -f json -c "stack_status" "$STACK_NAME" | jq -r '."stack_status"')
+    if [[ "${ACTIVE_BUILDS[@]}" =~ $STACK_NAME ]]; then
         # No need to delete stacks if there exists an active build for them
         continue
     else
-        echo "Deleting orphaned stack: $stack"
-        openstack stack delete --yes "$stack"
+        OS_STATUS=$(openstack stack show -f json -c stack_status "$stack" | jq -r '.stack_status')
+        case "$OS_STATUS" in
+            DELETE_IN_PROGRESS)
+                echo "skipping delete, $stack is already DELETE in progress."
+                continue
+            ;;
+            DELETE_FAILED)
+                echo "Stack delete failed, trying to stack abandon now."
+                # stack abandon does not work on RS, therefore requires acquiring a token
+                # and using http delete method to abondon DELETE_FAILED stacks
+                # Todo: remove the change once RS fixes the issue upstream
+                # openstack stack abandon "$STACK_NAME"
+                STACK_ID=$(openstack stack show -f json -c "id" "$STACK_NAME" | jq -r '."id"')
+                TOKEN=$(openstack token issue -f json -c id | jq -r '.id')
+                curl -si -X DELETE -H "Content-Type: application/json" -H "Accept: application/json"\
+                    -H "x-auth-token: $TOKEN"\
+                    "https://dfw.orchestration.api.rackspacecloud.com/v1/904885/stacks/$STACK_NAME/$STACK_ID/abandon"
+                STACK_SHOW=$(openstack stack show "$STACK_NAME")
+                echo "$STACK_SHOW"
+                continue
+            ;;
+            CREATE_COMPLETE|CREATE_FAILED)
+                echo "Deleting orphaned stack: $stack"
+                openstack stack delete --yes "$stack"
+                continue
+            ;;
+            *)
+                continue
+            ;;
+        esac
     fi
 done
index a7bd4afdfd039bebfc343ae7d7f28e40eb4df2c8..9e0266ea96977eb38d1dee1d2fef3c9ad1dac91c 100644 (file)
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+# upgrade git-review to a version that will have the --reviewers option. existing minion
+# image has a version that does not have it.
+sudo pip install git-review --upgrade
+
 # shellcheck disable=SC1083
 CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \
                limit:1 owner:self is:open project:{project} \
index bb411f54e44943bab51cbf96e4e782bfebc14120..18766ea46c27ce506db3e83c10af25a7a68356aa 100644 (file)
@@ -47,7 +47,15 @@ for try in $(seq $STACK_RETRIES); do
                     echo "$j: $STACK_SHOW"
                     if [[ $STACK_SHOW == *"DELETE_FAILED"* ]]; then
                         echo "stack delete failed. trying to stack abandon now"
-                        openstack stack abandon "$STACK_NAME"
+                        # stack abandon does not work on RS, therefore requires acquiring a token
+                        # and using http delete method to abondon DELETE_FAILED stacks
+                        # Todo: remove the change once RS fixes the issue upstream
+                        # openstack stack abandon "$STACK_NAME"
+                        STACK_ID=$(openstack stack show -f json -c "id" "$STACK_NAME" | jq -r '."id"')
+                        TOKEN=$(openstack token issue -f json -c id | jq -r '.id')
+                        curl -si -X DELETE -H "Content-Type: application/json" -H "Accept: application/json"\
+                            -H "x-auth-token: $TOKEN"\
+                            "https://dfw.orchestration.api.rackspacecloud.com/v1/904885/stacks/$STACK_NAME/$STACK_ID/abandon"
                         STACK_SHOW=$(openstack stack show "$STACK_NAME")
                         echo "$STACK_SHOW"
                     fi
@@ -70,7 +78,10 @@ for try in $(seq $STACK_RETRIES); do
             ;;
             *)
                 echo "Unexpected status: $OS_STATUS"
-                exit 1
+                # DO NOT exit on unexpected status. Rackspace sometimes returns unexpected status
+                # before returning an expected status. Just print the message and loop until we have
+                # a confirmed state or timeout.
+                # exit 1
             ;;
         esac
     done
index 5671a7231e9b0649cacbbbd61b68f4ec3c776cd6..9485b8bb10691a28ff4bd9f83cfd969f9832657b 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 7e936dd370d7899d499f7dd7d9d67d572ec2612b..59af112c358b504608a26eb8e3132dd79ca477a0 100644 (file)
@@ -31,7 +31,6 @@
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-ui,
-        odl-openflowplugin-app-table-miss-enforcer,
         decanter-collector-jmx,
         decanter-appender-elasticsearch
 
index 59be99d40d60f5bf62edbcc1f1b7b25c3e7365da..084bb62740843cbed2162f98a96507696531d8af 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -35,7 +36,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 52247b8ce29e84527c234ac7ef0ee717e8c82543..bc243cd2fc4cf4967408c9d3ee3cc608cee19fbc 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 2b22fd541cfcb80b56e95d15a82997e7277162cf..f5cea65d1c2f91383a3915ac4f59e608309108ca 100644 (file)
@@ -17,7 +17,7 @@ then
   # shellcheck disable=SC2154
   pkg_basename="${{PACKAGE##*/}}"
   # NB: Apt can't install directly from URL, so need this intermediary file
-  curl -o "$pkg_basename" "$PACKAGE"
+  curl -L --silent -o "$pkg_basename" "$PACKAGE"
   sudo dpkg --install ./"$pkg_basename"
 elif [[ $PACKAGE == ppa:* ]]
 then
index cd063e2e620eded47156d88967b08960dcfee7ee..22b151176cf080fbe0e1c90d5ed2424acdbb12f3 100644 (file)
@@ -18,9 +18,12 @@ sudo yum install -y ruby-devel gcc-c++ zlib-devel patch redhat-rpm-config make r
 gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 curl -L get.rvm.io | bash -s stable
 # Expected by RVM, seems required to make RVM functions (`rvm use`) available
+# Silence absurdly verbose rvm output by temporally not echoing commands
+set +x
 # shellcheck disable=SC1090
 source "$HOME/.rvm/scripts/rvm"
 rvm install 2.4.0
+set -x
 ruby --version
 # This has to be done as a login shell to get rvm fns
 # https://rvm.io/support/faq#what-shell-login-means-bash-l
@@ -31,7 +34,10 @@ ruby --version
 # Install gems dependencies of puppet-opendaylight via Bundler
 gem install bundler
 echo export PATH="\\$PATH:/usr/local/bin" >> "$HOME/.bashrc"
+# RVM's loaded functions print lots of output at this step, silence them
+set +x
 pushd "$WORKSPACE/puppet"
+set -x
 bundle install
 bundle update
 
index 86f2139cc4bf80c66dcabd7804ccac79758f7702..8e1ef5c232e338cd714845a5fed8fd97f60c2918 100644 (file)
       - archive-artifacts:
           artifacts: '**/*.rpm'
 
+    triggers:
+      - timed: '@daily'
+
 - job-template:
     name: 'packaging-test-rpm-{stream}'
 
       - string:
           name: PACKAGE
           # yamllint disable-line rule:line-length
-          default: 'http://ftp.gwdg.de/pub/opensuse/repositories/home:/akshitajha/xUbuntu_16.04/all/opendaylight_5.0.0-1_all.deb'
-          description: 'Link to .deb file or name of custom PPA repo (ppa:odl-team/boron)'
+          default: 'https://launchpad.net/~odl-team/+archive/ubuntu/carbon/+files/opendaylight_6.0.0-1_all.deb'
+          description: 'Link to .deb file or name of custom PPA repo (ppa:odl-team/carbon)'
 
     scm:
       - integration-gerrit-scm:
index acfc7c345bb957d5fffdcf83b5854b2c15917228..5f5e046bce449286a38958a4974f6db8fd806bf6 100644 (file)
@@ -77,7 +77,7 @@
           artifacts: '{archive-artifacts}'
       - string:
           name: TEST_SUITE
-          default: 'acceptance6_dock'
+          default: 'acceptance_dock'
           description: 'Set of tests to execute, Rakefile task'
 
     scm:
index 77c9b5bd38284078741e17c3aac852e9efb2a7fe..4157f74d39e507b2e184aa36ebd24954d9a42a86 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 1fd19e887fd4ff46c17de24bc463ffe1b49eb6cf..54ae11bbc300de0e67b4a5337c38650d0b74bb10 100644 (file)
@@ -71,6 +71,7 @@
 
     # Default Robot framework options
     robot-options: ''
+    trigger-jobs: ''
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
     # CSIT Test List Variables
     # Space seperated strings to exclude from
     # auto generated CSIT job lists
-    csit-list-blacklist: 'longevity gate sanity'
+    csit-list-blacklist: 'longevity gate sanity daexim'
 
     # Auto Generated CSIT job lists used
     # in regular distribution test jobs
         aaa-csit-1node-tls-only-nitrogen,
         alto-csit-1node-setup-all-nitrogen,
         alto-csit-1node-setup-only-nitrogen,
-        armoury-csit-1node-basic-all-nitrogen,
-        armoury-csit-1node-basic-only-nitrogen,
         bgpcep-csit-1node-periodic-bgp-ingest-all-nitrogen,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-nitrogen,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-nitrogen,
         controller-csit-3node-periodic-benchmark-all-nitrogen,
         controller-csit-3node-periodic-benchmark-only-nitrogen,
         controller-csit-3node-rest-clust-cars-perf-only-nitrogen,
-        daexim-csit-1node-basic-only-nitrogen,
         didm-csit-1node-discovery-only-nitrogen,
         distribution-csit-1node-userfeatures-all-nitrogen,
         distribution-csit-1node-userfeatures-only-nitrogen,
+        distribution-csit4-1node-userfeatures-all-nitrogen,
+        distribution-csit4-1node-userfeatures-only-nitrogen,
         dluxapps-csit-1node-yangman-all-nitrogen,
         dluxapps-csit-1node-yangman-only-nitrogen,
-        eman-csit-1node-model-all-nitrogen,
-        eman-csit-1node-model-only-nitrogen,
-        genius-csit-1node-genius-all-nitrogen,
-        genius-csit-1node-genius-only-nitrogen,
+        genius-csit-1node-upstream-all-nitrogen,
+        genius-csit-1node-upstream-only-nitrogen,
+        genius-csit-3node-upstream-all-nitrogen,
+        genius-csit-3node-upstream-only-nitrogen,
         groupbasedpolicy-csit-1node-3-node-all-nitrogen,
         groupbasedpolicy-csit-1node-3-node-only-nitrogen,
         groupbasedpolicy-csit-1node-6node-all-nitrogen,
         groupbasedpolicy-csit-1node-6node-only-nitrogen,
-        groupbasedpolicy-csit-1node-openstack-liberty-openstack-nitrogen,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-nitrogen,
         groupbasedpolicy-csit-1node-sxp-only-nitrogen,
         groupbasedpolicy-csit-3node-clustering-all-nitrogen,
         groupbasedpolicy-csit-3node-clustering-only-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-transparent-nitrogen,
+        netvirt-csit-1node-openstack-ocata-upstream-learn-nitrogen,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-nitrogen,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
+        netvirt-csit-1node-openstack-ocata-upstream-transparent-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-transparent-nitrogen,
+        netvirt-csit-3node-openstack-ocata-upstream-learn-nitrogen,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-nitrogen,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
+        netvirt-csit-3node-openstack-ocata-upstream-transparent-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
         aaa-csit-1node-tls-only-carbon,
         alto-csit-1node-setup-all-carbon,
         alto-csit-1node-setup-only-carbon,
-        armoury-csit-1node-basic-all-carbon,
-        armoury-csit-1node-basic-only-carbon,
         bgpcep-csit-1node-periodic-bgp-ingest-all-carbon,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-carbon,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-carbon,
         controller-csit-3node-periodic-benchmark-all-carbon,
         controller-csit-3node-periodic-benchmark-only-carbon,
         controller-csit-3node-rest-clust-cars-perf-only-carbon,
-        daexim-csit-1node-basic-only-carbon,
         didm-csit-1node-discovery-only-carbon,
         distribution-csit-1node-userfeatures-all-carbon,
         distribution-csit-1node-userfeatures-only-carbon,
-        distribution-csit4-1node-userfeatures-all-carbon,
-        distribution-csit4-1node-userfeatures-only-carbon,
         dluxapps-csit-1node-yangman-all-carbon,
         dluxapps-csit-1node-yangman-only-carbon,
-        eman-csit-1node-model-all-carbon,
-        eman-csit-1node-model-only-carbon,
-        genius-csit-1node-genius-all-carbon,
-        genius-csit-1node-genius-only-carbon,
+        genius-csit-1node-upstream-all-carbon,
+        genius-csit-1node-upstream-only-carbon,
+        genius-csit-3node-upstream-all-carbon,
+        genius-csit-3node-upstream-only-carbon,
         groupbasedpolicy-csit-1node-3-node-all-carbon,
         groupbasedpolicy-csit-1node-3-node-only-carbon,
         groupbasedpolicy-csit-1node-6node-all-carbon,
         groupbasedpolicy-csit-1node-6node-only-carbon,
-        groupbasedpolicy-csit-1node-openstack-liberty-openstack-carbon,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-carbon,
         groupbasedpolicy-csit-1node-sxp-only-carbon,
         groupbasedpolicy-csit-3node-clustering-all-carbon,
         groupbasedpolicy-csit-3node-clustering-only-carbon,
         netvirt-csit-1node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-1node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-1node-openstack-ocata-upstream-learn-carbon,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
+        netvirt-csit-1node-openstack-ocata-upstream-transparent-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-3node-openstack-ocata-upstream-learn-carbon,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-carbon,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
+        netvirt-csit-3node-openstack-ocata-upstream-transparent-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
         aaa-csit-1node-idmlite-only-boron,
         alto-csit-1node-setup-all-boron,
         alto-csit-1node-setup-only-boron,
-        armoury-csit-1node-basic-all-boron,
-        armoury-csit-1node-basic-only-boron,
         bgpcep-csit-1node-periodic-bgp-ingest-all-boron,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-boron,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-boron,
         didm-csit-1node-discovery-only-boron,
         distribution-csit-1node-userfeatures-all-boron,
         distribution-csit-1node-userfeatures-only-boron,
-        eman-csit-1node-model-all-boron,
-        eman-csit-1node-model-only-boron,
-        genius-csit-1node-genius-all-boron,
-        genius-csit-1node-genius-only-boron,
+        genius-csit-1node-upstream-all-boron,
+        genius-csit-1node-upstream-only-boron,
+        genius-csit-3node-upstream-all-boron,
+        genius-csit-3node-upstream-only-boron,
         groupbasedpolicy-csit-1node-3-node-all-boron,
         groupbasedpolicy-csit-1node-3-node-only-boron,
         groupbasedpolicy-csit-1node-6node-all-boron,
         groupbasedpolicy-csit-1node-6node-only-boron,
-        groupbasedpolicy-csit-1node-openstack-liberty-openstack-boron,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-boron,
         groupbasedpolicy-csit-3node-clustering-all-boron,
         groupbasedpolicy-csit-3node-clustering-only-boron,
         l2switch-csit-1node-periodic-host-scalability-daily-only-boron,
         netvirt-csit-1node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-1node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-1node-openstack-ocata-upstream-learn-boron,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-boron,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-boron,
+        netvirt-csit-1node-openstack-ocata-upstream-transparent-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-3node-openstack-ocata-upstream-learn-boron,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-boron,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-boron,
+        netvirt-csit-3node-openstack-ocata-upstream-transparent-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
         netvirt-legacy-csit-1node-openstack-basic-only-boron,
         netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-boron,
         netvirt-legacy-csit-1node-openstack-newton-upstream-boron,
+        netvirt-legacy-csit-1node-openstack-ocata-upstream-boron,
         netvirt-legacy-csit-3node-clustering-only-boron,
         netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-boron,
         netvirt-legacy-csit-3node-openstack-newton-upstream-boron,
+        netvirt-legacy-csit-3node-openstack-ocata-upstream-boron,
         nic-csit-1node-basic-all-boron,
         nic-csit-1node-basic-only-boron,
         nic-csit-1node-vtnrenderer-all-boron,
         aaa-csit-1node-idmlite-only-beryllium,
         alto-csit-1node-setup-all-beryllium,
         alto-csit-1node-setup-only-beryllium,
-        armoury-csit-1node-basic-all-beryllium,
-        armoury-csit-1node-basic-only-beryllium,
         bgpcep-csit-1node-periodic-bgp-ingest-all-beryllium,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-beryllium,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-beryllium,
         groupbasedpolicy-csit-1node-3-node-only-beryllium,
         groupbasedpolicy-csit-1node-6node-all-beryllium,
         groupbasedpolicy-csit-1node-6node-only-beryllium,
-        groupbasedpolicy-csit-1node-openstack-liberty-openstack-beryllium,
+        groupbasedpolicy-csit-1node-openstack-newton-openstack-beryllium,
         groupbasedpolicy-csit-3node-clustering-all-beryllium,
         groupbasedpolicy-csit-3node-clustering-only-beryllium,
         l2switch-csit-1node-periodic-host-scalability-daily-only-beryllium,
         netvirt-legacy-csit-1node-openstack-basic-only-beryllium,
         netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-beryllium,
         netvirt-legacy-csit-1node-openstack-newton-upstream-beryllium,
+        netvirt-legacy-csit-1node-openstack-ocata-upstream-beryllium,
         netvirt-legacy-csit-3node-clustering-only-beryllium,
         netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-beryllium,
         netvirt-legacy-csit-3node-openstack-newton-upstream-beryllium,
+        netvirt-legacy-csit-3node-openstack-ocata-upstream-beryllium,
         nic-csit-1node-basic-all-beryllium,
         nic-csit-1node-basic-only-beryllium,
         nic-csit-1node-vtnrenderer-all-beryllium,
index 0a28cb1280cad347cd05a9f9e599c43b7dc33d7a..4002578bd47bdfedcf0c4bddabb95be10abdc3f7 100644 (file)
       - timed: '@weekly'
 
     builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-old-images.sh
+      - shell: !include-raw-escape:
+          - global-jjb/shell/lftools-install.sh
+          - opendaylight-infra-cleanup-old-images.sh
 
     publishers:
       - email-notification:
index 054c973879befa1afa754ca1a664655124dd8715..73ef1eed08880ce53485f1793fa0cb74eea0a092 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index b82ec9851d534545b8083363a62964e7ceb4aa73..2c32dfe76eb87b053abf885cd601ec3e3eb954f7 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 2601fee5ed1c6874a694d267de1837fff5bb9380..13ca70d9c37d06c160ea06d98e807923b8beb37e 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 47021f45b2e27553fee4fca8f6bd211cb8863321..44ddc07f249e9a1fe3387f448a172daa473d7987 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index f77e4ab8298fc741b8c3eda324c3baefee6364b9..3cf225219fcbc433a5351b8dd3ab13a74653fa72 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       # remove nitrogen validate job until SNMP4SDN is back in nitrogen
@@ -32,7 +33,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 86b12f343e7ab4812ffc67e6313fc76b60b03cb4..32152e1dddd66d203171512ac2f04895eb3e2686 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index fa72c749e678c0f4db0bc15f450c6d8309c390f3..7ac5137e08155d3120ff422687d27c37396a14f5 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 1b357c77fa326a404c29c7a6e7ee363a347796c9..b8e5cd3c8a02cd96112f609407742494a3524a80 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index e2a549fe1336ab5fa045d535cb74244457ae2fb6..5a9d13f93138e3d7357f9a7303b1ad7a2aa93c79 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 12b55668c1eda981e936ee1c2e3ba6e941fa6988..bf9b84e9b8f6364ceff96e5fbf45ca822329e9c9 100644 (file)
@@ -4,9 +4,10 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 9e965381da82f1616d34dccf48cc988d3bcf286a..7798961f115a961b266d3940248182d39c395166 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 8be32ffae8d9fe1c586ac847e5341f1ae1ac3a39..67ce4ac85131fb448d1b6f90f6424bb0c795a0d0 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index a564d0457ca69050ce2d5645827479ed7a12896a..bf46dcc81f852b1cfeb4a0a48c1bd520914cb887 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -35,7 +36,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index ee4b308e7e9e0795c3a521d5df20b715c708a870..d839cb7b9275b863e2e6c1f0aa2d648fa7842dc7 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 7e652a52069b17f591ee948446459f447286f0d4..4aeeea1478272594db0a067bb1178f70e02842d5 100644 (file)
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -31,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
index 55efc9970af866df8349ada2af99617be6302fb1..5f392cf8a15c69c97839144fa0edd6bb26d0e19b 100644 (file)
@@ -47,15 +47,3 @@ apt-get install vlan
 
 # Install netaddr package which is needed by some custom mininet topologies
 apt-get install python-netaddr
-
-#Check out 6Wind quagga with tag name '20170418', compile and install for router functionalities
-echo "---> Installing the Quagga..."
-mkdir -p /tmp/build_quagga
-cd /tmp/build_quagga
-git clone https://github.com/6WIND/zrpcd.git
-cd zrpcd
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2
-
-# Removing the build_quagga folder
-rm -rf /tmp/build_quagga/
diff --git a/tox.ini b/tox.ini
index 3f2334b99a4949974e300e80efda64d0944d2859..2b5af0c333baa370043f7f5e1f0be8c01e32053e 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,8 @@ skipsdist = true
 [testenv:coala]
 basepython = python3
 deps =
-    coala
-    coala-bears
+    coala==0.11
+    coala-bears==0.11
 commands =
     python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger
     coala --non-interactive