Merge "Update devstack-stein image to the latest"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 97deb3c16f3021afd66d9b090e4d09eea67cb7c8..8dbb76a768c35809158898c9f5f3a42c2a4fc4a8 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -11,6 +11,7 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340
 * ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740
 * ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+* ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 * ZZCI - CentOS 7 - devstack - 20171208-1648
 * ZZCI - CentOS 7 - devstack - 20180723-235345.727
 * ZZCI - CentOS 7 - devstack - 20180911-204116.460
@@ -22,6 +23,7 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - CentOS 7 - devstack-rocky - 20190601-000116.015
 * ZZCI - CentOS 7 - devstack-rocky - 20190628-065204.973
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
+* ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200101-010206.159
 * ZZCI - CentOS 7 - docker - 20171209-0317
 * ZZCI - CentOS 7 - docker - 20180109-0346
 * ZZCI - CentOS 7 - docker - 20180110-1659

diff --git a/global-jjb b/global-jjb
index eededd9e9094b6a19e2611d40c29dca30559c42b..0bc70d1762dc88b90d4f9aa99a2f3bbf2b55b078 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit eededd9e9094b6a19e2611d40c29dca30559c42b
+Subproject commit 0bc70d1762dc88b90d4f9aa99a2f3bbf2b55b078

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
new file mode 100644 (file)
index 0000000..1eff3f1
--- /dev/null
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-25-1c-4g.cfg
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200121-232651.765
+HARDWARE_ID=odl-standard-1

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index 867b909cf6c4cdd4ce3358d95281ba12ff9a15de..b67ca0d566957cb30a073693029359b8aae4ce53 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -13,8 +13,14 @@
 
     # Project branches
     stream:
+      - magnesium:
+          branch: 'master'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
       - neon:
           branch: 'stable/neon'
+          testplan: '{project}-{functionality}-neon.txt'
 
     install:
       - all:
@@ -28,3 +34,4 @@
 
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0
+

diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst
index bff243da3c7b74998070908f2be782b5fa17ffd1..634406388991477da86a00900ad581bf98418266 100644 (file)
--- a/jjb/integration/csit-jobs-magnesium.lst
+++ b/jjb/integration/csit-jobs-magnesium.lst
@@ -1,3 +1,4 @@
+aaa-csit-1node-authn-all-magnesium,
 bgpcep-csit-1node-bgp-ingest-all-magnesium,
 bgpcep-csit-1node-bgp-ingest-mixed-all-magnesium,
 bgpcep-csit-1node-throughpcep-all-magnesium,

diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
index fa3544473c53c63bc10ed8d419f061714e1d6de9..b5b03b53a9d74d8f87e90c1d5b5e7fa2a6a8ed2e 100644 (file)
--- a/jjb/integration/csit-jobs-sodium.lst
+++ b/jjb/integration/csit-jobs-sodium.lst
@@ -1,3 +1,4 @@
+aaa-csit-1node-authn-all-sodium,
 bgpcep-csit-1node-bgp-ingest-all-sodium,
 bgpcep-csit-1node-bgp-ingest-mixed-all-sodium,
 bgpcep-csit-1node-throughpcep-all-sodium,

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 65387ddfd713a63d9b53634476d86215d27d3fb3..623489a4259a7ae58584b57d024c10ed51b84cf2 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -24,6 +24,7 @@
       - magnesium:
           branch: 'master'
           java-version: 'openjdk11'
+          jre: 'openjdk11'
           karaf-version: odl
       - sodium:
           branch: 'stable/sodium'
@@ -71,6 +72,7 @@
       - magnesium:
           branch: 'master'
           java-version: 'openjdk11'
+          jre: 'openjdk11'
           dependencies: >
               aaa-maven-merge-{stream},
               bgpcep-maven-merge-{stream},

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 4ed7f4ff1c340b45cd2f8955b4c673f09fb80487..1d169c4b0ab4f6df41ade505f2bdb4f62b2f49ff 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -9,6 +9,7 @@
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 5d2b2e7e2e2ca8a01ef154759f4f349b6a29195c..939a3673c2ea0e6b116346be64d000ef6b07d9f4 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -8,7 +8,7 @@
     stream:
       - magnesium:
           branch: 'master'
-          libuv-version: '1.8.0'
+          libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
           openvswitch-version: '2.12.0'
       - sodium:

diff --git a/jjb/opflex/opflex-thirdparty-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml
index 46ba2451c7dd40333c1eae124d0c774de07d11fb..0a2f14d7fdb2d63e88793b3d138371565122957d 100644 (file)
--- a/jjb/opflex/opflex-thirdparty-dependencies.yaml
+++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml
@@ -9,7 +9,7 @@
     stream:
       - oxygen:
           branch: 'master'
-          libuv-version: '1.8.0'
+          libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
           openvswitch-version: '2.12.0'
           disable-job: true
@@ -27,12 +27,9 @@
 - job-template:
     name: 'opflex-thirdparty-libuv-{stream}'
 
-    disable-job: false
-
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
-    disabled: '{disable-job}'
 
     group-id: 'libuv'
 

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index f0ab2920287edc70354f7cd1f69c746ded0bc62e..6511ce90c8a7a416207522ca3b2c1a7c48e0f706 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -12,7 +12,7 @@
     stream:
       - magnesium:
           branch: 'master'
-          libuv-version: '1.8.0'
+          libuv-version: '1.20.2'
           rapidjson-version: '1.1.0'
           openvswitch-version: '2.12.0'
       - sodium:

diff --git a/jjb/plastic/plastic.yaml b/jjb/plastic/plastic.yaml
index a7cee003513dbcc12cfdad01cb369ebe21659bf6..b3f5132adbcaf138b10c8045acf3a02043b90efb 100644 (file)
--- a/jjb/plastic/plastic.yaml
+++ b/jjb/plastic/plastic.yaml
@@ -4,6 +4,7 @@
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
           project-pattern: plastic
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-plastic/102307/
           rtd-token: 963a1745b909ae6a1eae01f814c4983d17fdd44c
@@ -23,6 +24,22 @@
     # Used by the release job
     staging-profile-id: 380d129f253e1
 
+- project:
+    name: plastic-2.1.6
+    jobs:
+      - odl-maven-jobs
+
+    stream: 2.1.6
+    project: plastic
+    project-name: plastic
+    branch: 2.1.6
+    java-version: openjdk8
+    mvn-settings: plastic-settings
+    mvn-opts: '-Xmx1024m'
+
+    # Used by the release job
+    staging-profile-id: 380d129f253e1
+
 - project:
     name: plastic-sonar
     jobs:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 5facaeae0629119a1f81524438950a0b0abd54bb..122de31adc695f049102187dd2e70cdb0079708e 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -27,6 +27,33 @@
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
+- project:
+    name: yangtools-4.0.x
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: yangtools
+    project-name: yangtools
+    branch: 4.0.x
+    stream: 4.0.x
+
+    java-version: 'openjdk11'
+    mvn-settings: 'yangtools-settings'
+
+    dependencies: ''
+    email-upstream: '[yangtools]'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
 - project:
     name: yangtools-v3.0.x
     jobs:

diff --git a/packer/common-packer b/packer/common-packer
index 1d5bbea3f4a9c037228a923e47dd76f70aeae2a9..c024a2568d2c87e303a07ffaf7e6093096dbddbe 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 1d5bbea3f4a9c037228a923e47dd76f70aeae2a9
+Subproject commit c024a2568d2c87e303a07ffaf7e6093096dbddbe