Merge "Switch mdsal-distcheck-oxygen to mvn35"

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
index 630fb4f1f448bc573e68d75dccb0dc0243c86a3e..c0441af51a0d0a401d5e656be0754f4b09a488ee 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
@@ -29,7 +29,7 @@
         odl-restconf,
         odl-bgpcep-bgp,
         odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter,
+        odl-bgpcep-data-change-counter
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 7c9d5bb83bb4911665864859566027e69017fad0..37137285cea644d49f2d470f89b62a4d18250025 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -30,7 +30,7 @@
         odl-restconf,
         odl-bgpcep-bgp,
         odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter,
+        odl-bgpcep-data-change-counter
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 8dca4d772d074734833f10393c6fea1578bfe61e..a078abb9fe0e050e1dcb4a2b13484699bb4b2268 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -31,7 +31,7 @@
         odl-jolokia,
         odl-bgpcep-data-change-counter,
         odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: >

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 6596c26f534eb1101a22d3f5235ac59aea2f3db2..96ae34914ee058bb956b1c554994f80aedd761e1 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -28,8 +28,7 @@
     install-features: >
         odl-restconf-noauth,
         odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-netconf-clustered-topology
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 3fe467e0475301b16798bba4a5bfe10ef3d5cf81..1ffd0ea7d9d4680920ff929e00d312b5aa9b1f91 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -205,7 +205,7 @@
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 10917810ad800e4f8455da46f69fe7e6b25f6259..6d235e237d984bbdc59618a36be352f31a9bc326 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -23,7 +23,7 @@
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 472febb4f2ef2d164e05fa8a2eb0e66da76ccbd3..1ce162a0f2628a83785ff43a88583885b0528abd 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1446,7 +1446,7 @@
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index add368112f8daf4bb5f526147681557e8aa09ae2..b5c23f5aed742c8221622a691fe85a4d28a76cbc 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -237,7 +237,7 @@
 
     project-type: freestyle
     node: centos7-builder-4c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 043b62f1231ec341418a5727f557e5ac43098902..74bd6b25c4baadf2ddd3b73ad357022985f57789 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -138,7 +138,7 @@
     project-type: freestyle
     node: centos7-docker-1c-4g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
     description: >
         Integration tests for the Netvirt project against different versions of
         OVS and branches. This job runs nightly.

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 94b69ef54d7f36fbbcc0bd492a954b8c419fca99..68b7292da8dbb8c70feec3c8fe47e4c76b7daa02 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -32,7 +32,7 @@
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -92,7 +92,7 @@
     name: 'opflex-merge-{stream}'
 
     node: centos7-builder-2c-8g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 1272d6bfadc879c3832f9ce20cf4e317509bb2f1..3f85b082450275faec2416115d08bd9c38b19115 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -39,7 +39,7 @@
     name: 'opflex-release-{stream}'
 
     node: centos7-builder-2c-8g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     ######################
     # Default parameters #

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 60473bb322df49fcb79db4fc03befb1cd51b85c1..7b86adad7975c614556c00eca64e1a79309dddf5 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -95,7 +95,7 @@
 
     project-type: freestyle
     node: centos7-docker-1c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
     description: >
         Integration tests for the OVSDB project against different versions of
         OVS and branches. This job runs nightly.

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 53392a17193e4fd9848cb1de29000a2c7fb73dc9..47413b7095846a3f9e4259633334d64c0b266b6b 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -12,7 +12,7 @@
 
     project-type: freestyle
     node: centos7-docker-1c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index cd16b8530f02a0a382b333ae42d185d5dcfef217..c299c63a538bbff03082c6f7a27c4ae5d6a358f9 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -106,7 +106,6 @@
     # Maven / Java
     java-version: 'openjdk8'
     jre: 'openjdk8'
-    jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index a34dbc9676c5c4af380f94f5086a0cc8a5bebd76..48452b5c3f5fbdc1efcb53f4b5beba9932087c64 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -36,7 +36,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 9bdbd51d26f36d2910b080c886952f32999dd3fa..4a5eef8b18b0526a452a73e63e7c7b1bdea22090 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -7,7 +7,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -75,7 +75,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     parameters:
       - opendaylight-infra-parameters: