Merge changes from topic 'shellcheck'

* changes:
  Fix SC2086 Double quote variables
  Fix SC2086 for lines 300 until EOF
  Fix SC2086 for lines 490 until EOF
  Fix SC2086 for lines 575 until EOF
  Fix SC2086 for lines 700 until EOF
  Fix SC2086 for lines 940 until EOF
  Fix SC2004 $/${} unnecessary on arithmetic vars
  Fix SC2006 backtick syntax is legacy

diff --git a/global-jjb b/global-jjb
index d589c771dc75206bb2b6d592435c8316cffd29fb..52c43271810a9144ca7192ceb15ba3de29e88f31 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit d589c771dc75206bb2b6d592435c8316cffd29fb
+Subproject commit 52c43271810a9144ca7192ceb15ba3de29e88f31

diff --git a/jjb/autorelease/update-autorelease-projects-views.sh b/jjb/autorelease/update-autorelease-projects-views.sh
index e34bb6d55b35f1e17ec99ef89f47fc5989d466b5..b3cfe9036f6f449385b50a3689bf86b8074967d1 100755 (executable)
--- a/jjb/autorelease/update-autorelease-projects-views.sh
+++ b/jjb/autorelease/update-autorelease-projects-views.sh
@@ -8,6 +8,7 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+echo "---> update-autorelease-projects-views.sh"
 
 VIEWS_AR_YAML_FILE="${WORKSPACE}/jjb/autorelease/view-autorelease-${STREAM}.yaml"
 BRANCH="stable/${STREAM}"
@@ -60,4 +61,5 @@ echo "    <<: *releng_autorelease_view_common_${STREAM}" >> "$VIEWS_AR_YAML_FILE
 
 git add "${VIEWS_AR_YAML_FILE}"
 
-cp "${VIEWS_AR_YAML_FILE}" $WORKSPACE/archives
+mkdir -p ${WORKSPACE}/archives
+cp "${VIEWS_AR_YAML_FILE}" ${WORKSPACE}/archives

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 2115e9bbe726a97508ab162cca1b4c5ecfe1f2e7..d5275e845801c465c6086189e33e1f63cfa40c0d 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -3,7 +3,6 @@
     name: controller-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: controller

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 251842596bb09ce92d0eb403a3ded8130c083dda..fcda1efea719a645674de782624fc9affa18a86e 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,8 +2,6 @@
 - project:
     name: mdsal-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs':
-          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
@@ -35,8 +33,6 @@
 - project:
     name: mdsal-3.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs':
-          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
@@ -70,9 +66,6 @@
     jobs:
       - '{project-name}-distribution-check-{stream}':
           mvn-version: 'mvn35'
-      - '{project-name}-maven-javadoc-jobs':
-          mvn-version: 'mvn33'
-          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal

diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml
index 4012b53e367f0d7d591b42c52f8c7d2b151a0ddc..05c84644b2f82deff7ecd7175646680d90fa9392 100644 (file)
--- a/jjb/netconf/netconf-csit-callhome.yaml
+++ b/jjb/netconf/netconf-csit-callhome.yaml
@@ -26,7 +26,7 @@
           scope: 'only'
 
     # no mininet required
-    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20180723-235516.505
+    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20190521-223526.319
 
     # Features to install
     install-features: 'odl-netconf-callhome-ssh,odl-restconf'

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 5b41d7dc62b4620583697d06ec8f7e3baee5f590..fe017c2e209e3f2c4136c4e709c573406df19b1c 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -26,7 +26,7 @@
       - all:
           scope: 'all'
 
-    tools_system_image: ZZCI - Ubuntu 14.04 - gbp - 20180723-235516.505
+    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20190521-223526.319
 
     # Features to install
     install-features: >

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index eb19a651722db51e699463dc43caac88af4fa86f..a56c4fbe659c8a984c6bdfd564813e87f51a4fb2 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -225,10 +225,10 @@
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
-      # Test Neon ('Managed Release Common Distro') release tarball
+      # Test Neon SR1 ('Managed Release Common Distro') release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/opendaylight/0.10.0/opendaylight-0.10.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/opendaylight/0.10.1/opendaylight-0.10.1.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -330,10 +330,10 @@
       - shell: !include-raw: build-rpm-snap.sh
       - install-test-uninstall-rpm
 
-      # Test Neon release tarball
+      # Test Neon SR1 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.10.0/karaf-0.10.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.10.1/karaf-0.10.1.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index 8ee10a8d71f7e7e44ba828688a16dbf09cdd3e0a..8088d22df074fb43f28e37671fe9caf7555bf84f 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -112,7 +112,8 @@
     platforms:
       - ubuntu-14.04
       - ubuntu-16.04
-      - ubuntu-18.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: gbp
 
 - project:
@@ -131,7 +132,8 @@
 
     platforms:
       - ubuntu-16.04
-      - ubuntu-18.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: mininet-ovs-2.5
 
 - project:
@@ -150,7 +152,8 @@
 
     platforms:
       - ubuntu-16.04
-      - ubuntu-18.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: mininet-ovs-2.6
 
 - project:
@@ -169,7 +172,8 @@
 
     platforms:
       - ubuntu-16.04
-      - ubuntu-18.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: mininet-ovs-2.8
 
 - project:
@@ -205,5 +209,6 @@
 
     platforms:
       - ubuntu-16.04
-      - ubuntu-18.04
+      - ubuntu-18.04:
+          disable-job: true
     templates: kubernetes

diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml
index d9b7c2f3846e81079e2fe2385c2bd4feb826f353..dcd125dc6719bf05d1fed05b721843cc41c18007 100644 (file)
--- a/jjb/releng-views.yaml
+++ b/jjb/releng-views.yaml
@@ -133,6 +133,22 @@
     view-description: 'List of Javadoc jobs'
     view-regex: '.*-javadoc-.*'
 
+- project:
+    name: Maven-Stage
+    views:
+      - common-view
+    view-name: Maven-Stage
+    view-description: 'List of Maven Stage jobs'
+    view-regex: '.*-maven-stage-.*'
+
+- project:
+    name: Maven-Verify-Deps
+    views:
+      - common-view
+    view-name: Maven-Verify-Deps
+    view-description: 'List of Maven Verify Deps jobs'
+    view-regex: '.*-maven-verify-deps-.*'
+
 - project:
     name: Merge-Jobs
     views:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 2ef1116850e537ff15633b0a444be52557b92eed..0f3c41559e10c72d842d586d4a526257e3f71669 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,8 +2,6 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs':
-          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
@@ -30,8 +28,6 @@
 - project:
     name: yangtools-v2.1.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs':
-          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
@@ -58,8 +54,6 @@
 - project:
     name: yangtools-v2.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs':
-          disable-job: true
       - odl-maven-jobs
 
     project: yangtools

diff --git a/packer/common-packer b/packer/common-packer
index 8cad102383fdf28db36d05298771e1b16e70cbf4..6d52ef66fa727d6b8c528a99591e997ebfe80c2b 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 8cad102383fdf28db36d05298771e1b16e70cbf4
+Subproject commit 6d52ef66fa727d6b8c528a99591e997ebfe80c2b