Merge "Disable shellcheck for specific scripts"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 36e385a6c0621a7265eea6bcff7d87116a92c43a..fb85cf2ab3eb584aecfd0c15184b1579fe4fc3fb 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -27,8 +27,7 @@
     archive-artifacts: >
         **/*.prop
         **/*.log
-        **/patches/*.bundle
-        **/patches/*.patch
+        patches/**
         patches.tar.gz
 
 ###

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

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 7f3d5191684a5387b9bc69e7f3b6616a2d84fe41..65fb04a2190c8f6d1e92738f51aeda2fe7adb598 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -4,6 +4,7 @@
     jobs:
       - 'docs-merge-rtd-{stream}'
       - 'docs-verify-rtd-{stream}'
+      - '{project-name}-verify-tox-{stream}'
 
     stream:
       - carbon:
@@ -13,8 +14,9 @@
       - beryllium:
           branch: 'stable/beryllium'
 
-    project: 'docs'
-    rtdproject: 'opendaylight'
+    project: docs
+    project-name: docs
+    rtdproject: opendaylight
     archive-artifacts: 'docs/_build/html/**'
 
 - job-template:

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 843129a33e57bc038c29a1b524949dd4056b51e1..84c61f8a2b78aab2a0d7f0b4440c86b809d22ddc 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -157,6 +157,8 @@
         bgpcep-csit-3node-periodic-bgpclustering-all-carbon,
         bgpcep-csit-3node-periodic-bgpclustering-ha-only-carbon,
         bgpcep-csit-3node-periodic-bgpclustering-only-carbon,
+        bier-csit-1node-basic-all-carbon,
+        bier-csit-1node-basic-only-carbon,
         capwap-csit-1node-ac-all-carbon,
         capwap-csit-1node-ac-only-carbon,
         centinel-csit-1node-basic-all-carbon,
@@ -315,6 +317,8 @@
         sxp-csit-1node-topology-only-carbon,
         sxp-csit-3node-periodic-clustering-all-carbon,
         sxp-csit-3node-periodic-clustering-only-carbon,
+        sxp-csit-3node-periodic-routing-all-carbon,
+        sxp-csit-3node-periodic-routing-only-carbon,
         topoprocessing-csit-1node-topology-operations-all-carbon,
         topoprocessing-csit-1node-topology-operations-only-carbon,
         tsdr-csit-1node-cassandra-datastore-only-carbon,
@@ -516,7 +520,6 @@
         topoprocessing-csit-1node-topology-operations-all-boron,
         topoprocessing-csit-1node-topology-operations-only-boron,
         tsdr-csit-1node-cassandra-datastore-only-boron,
-        tsdr-csit-1node-elasticsearch-datastore-only-boron,
         tsdr-csit-1node-hbase-datastore-all-boron,
         tsdr-csit-1node-hbase-datastore-only-boron,
         tsdr-csit-1node-hsqldb-datastore-all-boron,
@@ -661,7 +664,6 @@
         topoprocessing-csit-1node-topology-operations-all-beryllium,
         topoprocessing-csit-1node-topology-operations-only-beryllium,
         tsdr-csit-1node-cassandra-datastore-only-beryllium,
-        tsdr-csit-1node-elasticsearch-datastore-only-beryllium,
         tsdr-csit-1node-hbase-datastore-all-beryllium,
         tsdr-csit-1node-hbase-datastore-only-beryllium,
         tsdr-csit-1node-hsqldb-datastore-all-beryllium,

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

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

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