Merge "Bump pup-odl ruby version 2.4 to 2.6 (latest)"

diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst
index f6a99cd324b5216a61f53a6982cbf3aaf52e20f2..d39a0326ea17effa48bfe17262eed4ac03c45f65 100644 (file)
--- a/jjb/integration/csit-jobs-oxygen.lst
+++ b/jjb/integration/csit-jobs-oxygen.lst
@@ -74,7 +74,6 @@ sxp-csit-1node-filtering-all-oxygen,
 sxp-csit-1node-performance-all-oxygen,
 sxp-csit-1node-topology-all-oxygen,
 sxp-csit-3node-clustering-all-oxygen,
-sxp-csit-3node-routing-all-oxygen,
 tsdr-csit-1node-cassandra-datastore-only-oxygen,
 tsdr-csit-1node-elasticsearch-datastore-only-oxygen,
 tsdr-csit-1node-hbase-datastore-all-oxygen,

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 9c2b14ea3d82ec4900bcef974c97c13002196f74..004b1e79622dca93cd68567ff4266a5fa4045ea4 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -25,30 +25,19 @@
           # Self-Managed projects repos and features:
           sm-repos: >
               mvn:org.opendaylight.sxp/features-sxp//xml/features,
-              mvn:org.opendaylight.telemetry/features-telemetry//xml/features,
-              mvn:org.opendaylight.tsdr/features-tsdr//xml/features
+              mvn:org.opendaylight.telemetry/features-telemetry//xml/features
           sm-features: >
               odl-sxp-routing,
               odl-telemetry-collector,
               odl-telemetry-configurator,
-              odl-telemetry-all,
-              odl-tsdr-core,
-              odl-tsdr-openflow-statistics-collector,
-              odl-tsdr-netflow-statistics-collector,
-              odl-tsdr-restconf-collector,
-              odl-tsdr-syslog-collector,
-              odl-tsdr-controller-metrics-collector,
-              odl-tsdr-cassandra,
-              odl-tsdr-hbase,
-              odl-tsdr-hsqldb,
-              odl-tsdr-elasticsearch
+              odl-telemetry-all
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
               mvn:org.opendaylight.sxp/features-sxp//xml/features,
-              mvn:org.opendaylight.transportpce/features-transportpce//xml/features,
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
           sm-features: >
               odl-sxp-routing,
               odl-transportpce,
@@ -188,7 +177,7 @@
               sxp-merge-{stream},
               telemetry-merge-{stream},
               tsdr-merge-{stream},
-              unimgr-merge-{stream},
+              unimgr-merge-{stream}
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
@@ -198,7 +187,7 @@
               sxp-merge-{stream},
               transportpce-merge-{stream},
               tsdr-merge-{stream},
-              unimgr-merge-{stream},
+              unimgr-merge-{stream}
 
 - project:
     name: distribution-release

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 40475f69a85b6de2c82b215a08cc4141ff4d6710..b1b6c24d74f9c3cd2ef342cdfd9ebc3925d511ec 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -196,6 +196,11 @@
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 1440
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
     publishers:
       - opendaylight-infra-generate-csit-status-report
       - email-notification:

diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh
index 82220dff32a0f00ae3a6737828296febf4a7a15a..eac630698ebbee1b5c047085159e3a2489e55868 100755 (executable)
--- a/jjb/integration/multipatch-distribution.sh
+++ b/jjb/integration/multipatch-distribution.sh
@@ -5,12 +5,13 @@ set -e
 # create a fresh empty place to build this custom distribution
 BUILD_DIR=${WORKSPACE}/patch_tester
 DISTRIBUTION_BRANCH_TO_BUILD=$DISTROBRANCH  #renaming variable for clarity
-MAVEN_OPTIONS="$(echo --show-version \
+MAVEN_OPTIONS="${MAVEN_PARAMS} \
+    --show-version \
     --batch-mode \
     -Djenkins \
     -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
     -Dmaven.repo.local=/tmp/r \
-    -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
+    -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r"
 
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
@@ -180,10 +181,10 @@ if [[ -d "odlparent" ]]; then
     fi
 fi
 if [[ -d "yangtools" ]]; then
-        if [[ -d "mdsal" ]]; then
+    if [[ -d "mdsal" ]]; then
         # Extract patch and MSI used version
         patch_version="$(xpath ./yangtools/pom.xml '/project/version/text()' 2> /dev/null)"
-        msi_version="$(xpath ./mdsal/binding/yang-binding/pom.xml '/project/dependencyManagement/dependencies/dependency/version/text()' 2> /dev/null)"
+        msi_version="$(xpath ./mdsal/dom/dom-parent/pom.xml '/project/dependencyManagement/dependencies/dependency[artifactId="yangtools-artifacts"]/version/text()' 2> /dev/null)"
         # Replace version
         find ./yangtools -name "*.xml" -print0 | xargs -0 sed -i "s/${patch_version}/${msi_version}/g"
     else

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ba5479ee141cd44e51899a3dbef5041c59c69998..8b35fbf77a2b46bd8202baf73851a9677052fb5c 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -29,7 +29,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.8.0
+    jjb-version: 2.9.1
 
 - project:
     name: builder-openstack

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 3cb0856e0bb6ecd2790741a74a5c131f4abd9b4c..c137ab7b6e7bd31555890ea9c9d82f0b1b6216d1 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -17,13 +17,13 @@
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
 

diff --git a/jjb/sxp/sxp-csit-binding-origin.yaml b/jjb/sxp/sxp-csit-binding-origin.yaml
index a46a8d1a4c72ad93413b619fff389983c9c8ef15..3fe2e5be584526fb4c7c0b30865f3e28a7535f62 100644 (file)
--- a/jjb/sxp/sxp-csit-binding-origin.yaml
+++ b/jjb/sxp/sxp-csit-binding-origin.yaml
@@ -17,13 +17,13 @@
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
 
     install:
       - all:

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
deleted file mode 100644 (file)
index 723c3e4..0000000
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- project:
-    name: sxp-csit-routing
-    jobs:
-      - inttest-csit-3node
-
-    # The project name
-    project: 'sxp'
-
-    # The functionality under test
-    functionality: 'routing'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
-      - fluorine:
-          branch: 'stable/fluorine'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-routing'
-
-    # Tools VMs:
-    tools_system_count: 2
-
-    # Robot custom options:
-    robot-options: ''

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 700753c2429922ccde177eeef8309ba7bc7869b4..781ba19c36b3fbaf8725dd2c83407b2ba88753ad 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -17,13 +17,13 @@
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
 

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index 9bd243f7bca975ffaa368ec326acee5d768f2092..a443ff176539f38b822111645d825de3d0bd5d65 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -17,13 +17,13 @@
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
 

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index be41e19483781437bce7bf0a06c4312ebb9f5893..b02734dfa6d9f54b4cbba7282d36e7070cd8cd41 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -17,13 +17,13 @@
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
 

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 55bec1ec27237bf4089d694d2134b8b705b22ba1..ed1806babd74f134009907243ce7e041e0f381f6 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -17,13 +17,13 @@
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
       - fluorine:
           branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
           karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
 

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 73e9396604c46e79caadda98180174fe4cfdf6f0..c99554fd98cf81509247fa399def969520a3a8ed 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -87,6 +87,7 @@
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
 
     project: 'yangtools'
     project-name: 'yangtools'

diff --git a/tox.ini b/tox.ini
index cf80a1dd7687d3bf2b2916476deaa8a637d585eb..285f266275177f5b086239b0d129d51cb81ba7ed 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = coala,docs,pep8,prefix,robot
+envlist = coala,docs,jjb-version,pep8,prefix,robot
 skipsdist = true
 
 [testenv:coala]
@@ -23,7 +23,7 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:2.7.0}
+    jenkins-job-builder=={env:JJB_VERSION:2.9.1}
 commands =
     jenkins-jobs {posargs:--help}