Merge "Install Docker in regular builder"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9f5aa4ad1fcaf6f7f3ac474b9010d44d9e8112b8..f2a70310fe3db36533a75205063e0a55ee5a46bf 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
       - id: gitlint
 
   - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    sha: 2.0.2
+    rev: 2.0.2
     hooks:
       - id: shellcheck
         exclude: >
@@ -54,14 +54,8 @@ repos:
     hooks:
       - id: yamllint
 
-  - repo: local
+  - repo: https://github.com/btford/write-good
+    rev: master
     hooks:
-      # TODO: Switch to upstream hook when https://github.com/btford/write-good/pull/119 is merged.
       - id: write-good
-        name: write-good
-        description: Check docs for English prose with write-good
-        entry: write-good
-        language: node
-        files: "\\.(rst|md|markdown|mdown|mkdn)$"
-        additional_dependencies: ["write-good"]
         exclude: docs/jenkins.rst

diff --git a/check_prefix.py b/check_prefix.py
index 08f83653d98f7b34a79baaf22e66ee783baf114b..de561981c5f6f0491526457a0e84e3e5497274b8 100755 (executable)
--- a/check_prefix.py
+++ b/check_prefix.py
@@ -24,7 +24,7 @@ def check_prefix(filename):
     """Check if a prefix was checked into this repo."""
     with open(filename, "r") as _file:
         for num, line in enumerate(_file, 1):
-            if re.search("prefix:", line):
+            if re.search(r"^\s+prefix:", line):
                 if '""' not in line:
                     print(
                         "ERROR: A non-blank prefix is defined in "

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 15b967269f509f302f250b54197a9a54c510fbc7..eac39d7b662ce2333c1a2b2aebbafc2fab7b43a7 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -1,12 +1,5 @@
 Following are the list of published images available to Jenkins jobs.
 
-* ZZCI - CentOS 7 - autorelease - 20180125-2240
-* ZZCI - CentOS 7 - builder - 20180201-2139
-* ZZCI - CentOS 7 - builder - 20180611-1830
-* ZZCI - CentOS 7 - builder - 20180723-235310.638
-* ZZCI - CentOS 7 - builder - 20180802-220823.782
-* ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
-* ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
 * ZZCI - CentOS 7 - builder - x86_64 - 20190403-205252.587
 * ZZCI - CentOS 7 - builder - x86_64 - 20190723-062027.340
 * ZZCI - CentOS 7 - builder - x86_64 - 20190822-081553.740
@@ -18,16 +11,10 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - builder - x86_64 - 20200729-063722.113
 * ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
 * ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
-* ZZCI - CentOS 7 - devstack - 20171208-1648
-* ZZCI - CentOS 7 - devstack - 20180723-235345.727
-* ZZCI - CentOS 7 - devstack - 20180911-204116.460
 * ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836
-* ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
-* ZZCI - CentOS 7 - devstack-pike - 20171208-1649
-* ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
 * ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
 * ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200601-190140.080
 * ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200801-190141.781
@@ -43,19 +30,11 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200501-010133.750
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200801-010144.168
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200811-070703.256
-* ZZCI - CentOS 7 - docker - 20171209-0317
-* ZZCI - CentOS 7 - docker - 20180109-0346
-* ZZCI - CentOS 7 - docker - 20180110-1659
-* ZZCI - CentOS 7 - docker - 20180417-0311
-* ZZCI - CentOS 7 - docker - 20180723-235456.035
 * ZZCI - CentOS 7 - docker - x86_64 - 20190924-232930.807
 * ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 * ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
 * ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401
 * ZZCI - CentOS 7 - docker - x86_64 - 20200810-015757.604
-* ZZCI - CentOS 7 - java-builder - 20171206-1842
-* ZZCI - CentOS 7 - java-builder - 20171209-0032
-* ZZCI - CentOS 7 - robot - 20180601-2050
 * ZZCI - CentOS 7 - robot - 20190430-080312.962
 * ZZCI - CentOS 7 - robot - x86_64 - 20191002-145719.577
 * ZZCI - CentOS 7 - robot - x86_64 - 20200812-002103.678
@@ -64,18 +43,11 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - OPNFV - apex - compute - 0
 * ZZCI - OPNFV - apex - compute - 1
 * ZZCI - OPNFV - apex - controller - 0
-* ZZCI - Ubuntu 14.04 - gbp - 20171208-2336
-* ZZCI - Ubuntu 14.04 - gbp - 20180723-235516.505
-* ZZCI - Ubuntu 16.04 - docker - 20180601-2047
 * ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
 * ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200301-170125.878
 * ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
 * ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227
-* ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
-* ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431
 * ZZCI - Ubuntu 16.04 - gbp - 20190521-223526.319
-* ZZCI - Ubuntu 16.04 - kubernetes - 20180527-1344
-* ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
 * ZZCI - Ubuntu 16.04 - kubernetes - 20190206-080347.936
 * ZZCI - Ubuntu 16.04 - kubernetes - 20190211-225526.126
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240
@@ -85,7 +57,6 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200811-124233.615
-* ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229
@@ -95,3 +66,4 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200121-232651.765
 * ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200521-041758.169
 * ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200811-124252.042
+* ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20200731-200431.555

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

diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh
index 924341c78a2b448d89ceac13b4cc99e1a86425a9..8b2e26d994c964dd4a74573df98dcefa47c79c12 100644 (file)
--- a/jenkins-config/global-vars-releng.sh
+++ b/jenkins-config/global-vars-releng.sh
@@ -8,7 +8,7 @@ ODLNEXUSPROXY=https://nexus.opendaylight.org
 RELEASE_USERNAME=odl-release
 RELEASE_EMAIL=collab-it+odl-release@linuxfoundation.org
 SIGUL_BRIDGE_IP=10.30.168.3
-SIGUL_KEY=odl-release-2018
+SIGUL_KEY=odl-release-2020
 SILO=releng
 SONAR_URL=https://sonar.opendaylight.org
 S3_BUCKET=

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 3a3d55bbbe39cc441c9cd3324efb16d59f68559b..cdfe01cdc6339c754c83bf5b169326274c9c9308 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -45,7 +45,7 @@
       - shell: |
           #!/bin/bash -l
           set -xe -o pipefail
-          virtualenv -p python3 --system-site-packages $WORKSPACE/venv
+          python3 -m venv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
           $PYTHON -m pip install --upgrade networkx

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index c635e7b56127ba60762140e2ff4d6961461af624..140f7872b228c9bf2d8985d4008a2cd98128e331 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -39,6 +39,10 @@
     git-url: "ssh://jenkins-$SILO@git.opendaylight.org:29418"
     lftools-version: <1.0.0
 
+    # openstack-cron email notification defaults
+    failure-notification: "releng+ODL@linuxfoundation.org"
+    failure-notification-prefix: "[releng]"
+
     # defaults for parameters installing openstack for csit jobs
     devstack-hash: ""
     create-initial-networks: "False"

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index bde5060249019ea14eb6cf3705d0301124c81bf2..1dbb1ed7b061e1941f4deab9599bfd0573548081 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -107,7 +107,7 @@ function install_openstack_clients_in_robot_vm() {
        #Python uwsgi 2.0.19 is having errors, forcing it to pick 2.0.18
        sed -i '1 auwsgi===2.0.18' /tmp/constraints.txt
        #Python3 paramiko 2.7.1 has requirement cryptography>=2.5, Updating it to the latest
-       sed -i s/cryptography===2.3/cryptography===2.9.2/ /tmp/constraints.txt
+       sed -ie 's/cryptography===.*/cryptography===2.9.2/' /tmp/constraints.txt
        echo "$PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt"
        $PYTHON -m pip install --upgrade --no-deps "${package}" --no-cache-dir -c /tmp/constraints.txt
        echo "$PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt"
@@ -136,8 +136,8 @@ function install_rdo_release() {
           ${SSH} "${ip}" "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
           ;;
 
-       master)
-          ${SSH} "${ip}" "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-rocky/rdo-release-rocky-1.noarch.rpm"
+       *stein*)
+          ${SSH} "${ip}" "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-stein/rdo-release-stein-3.noarch.rpm"
           ;;
     esac
 }
@@ -353,6 +353,8 @@ minimize_polling=True
 # MTU(1400) + VXLAN(50) + VLAN(4) = 1454 < MTU eth0/br-physnet1(1458)
 physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400
 path_mtu = 1458
+[ml2_type_vlan]
+network_vlan_ranges=${PUBLIC_PHYSICAL_NETWORK}:1:4094
 EOF
     if [ "${ENABLE_GRE_TYPE_DRIVERS}" == "yes" ]; then
         cat >> "${local_conf_file_name}" << EOF
@@ -778,6 +780,10 @@ echo
 echo "workaround: do not upgrade openvswitch"
 sudo yum install -y yum-plugin-versionlock
 sudo yum versionlock add openvswitch
+
+echo "workaround: upgrade pip and setuptools"
+sudo pip install --upgrade pip
+sudo pip install --upgrade setuptools
 EOF
 
 cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index e91454dcb03a361859b4d8e418e13ef7b2522a13..2a961fdb146fcbbf22a3a65875f3c795c54ef5ab 100644 (file)
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -16,7 +16,7 @@ echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 # The --system-site-packages parameter allows us to pick up system level
 # installed packages. This allows us to bake matplotlib which takes very long
 # to install into the image.
-virtualenv -p python3 --system-site-packages "${ROBOT_VENV}"
+python3 -m venv "${ROBOT_VENV}"
 # shellcheck disable=SC1090
 source "${ROBOT_VENV}/bin/activate"
 
@@ -28,7 +28,6 @@ python -m pip install --upgrade pip
 echo "Installing Python Requirements"
 cat << 'EOF' > "requirements.txt"
 docker-py
-importlib
 ipaddr
 netaddr
 netifaces

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 90a19d3d7d589ce2a2d5d6efb6b313ecb8a18dbb..f534b8f9fd23a4a8b59efefdad6444ed2b422f8a 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -103,6 +103,7 @@
     project-name: lf-infra-docs-conf
     project: releng/docs-conf
     project-pattern: releng/docs-conf
+    project-slug: lfdocs-conf
     build-node: centos7-builder-2c-1g
     rtd-build-url: https://readthedocs.org/api/v2/webhook/lfdocs-conf/32931/
     rtd-token: 27a59073490f2cefab41761dc225ac8c8bfdf028

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index d4cc0a468beb153ede5ab2b82814d121acb11f9e..9feef79e9c5c95381dcabb6eb2fe41e88ebc19d2 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -58,8 +58,8 @@
           branch: "master"
           jre: "openjdk11"
           robot-options:
-            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:250
-            -v MAX_DEVICE_COUNT:1000 -v DEVICE_INCREMENT:100 -v TESTTOOL_BOOT_TIMEOUT:600s
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400
+            -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200 -v TESTTOOL_BOOT_TIMEOUT:600s
             -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
       - magnesium:
           branch: "stable/magnesium"
@@ -97,3 +97,5 @@
     01-plot-yaxis: "Devices"
     01-plot-group: "Netconf Devices"
     01-plot-data-file: "devices.csv"
+
+    build-timeout: "720"

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index b4262e3772e9ca58ab21038ef457bf61465d9b30..aa99daf991a3bae7f0ebcfa3055827b23c7b48cb 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -15,7 +15,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -86,7 +86,8 @@
     name: netvirt-csit-openstack-integration-silicon-stein
     jobs:
       - inttest-csit-openstack-custom
-
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     stream: "silicon"
     branch: "master"
@@ -181,7 +182,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -253,6 +254,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     stream: "aluminium"
     branch: "stable/aluminium"
@@ -336,6 +339,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     stream: "magnesium"
     branch: "stable/magnesium"
@@ -757,6 +762,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"
@@ -836,6 +843,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disabled: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"

diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml
index 2ece2821d669493b0ea31e1937a7b1e497696bc4..06cd6093a3553663c9280cb5a1e59d99abfd913e 100644 (file)
--- a/jjb/odlsaf/odlsaf.yaml
+++ b/jjb/odlsaf/odlsaf.yaml
@@ -8,7 +8,7 @@
     stream: silicon
     project: "odlsaf"
     project-name: "odlsaf"
-    build-node: centos7-builder-2c-2g
+    build-node: centos7-builder-4c-4g
     build-timeout: 120
     branch: "master"
     java-version: "openjdk11"
@@ -28,7 +28,7 @@
     stream: aluminium
     project: "odlsaf"
     project-name: "odlsaf"
-    build-node: centos7-builder-2c-2g
+    build-node: centos7-builder-4c-4g
     build-timeout: 120
     branch: "stable/aluminium"
     java-version: "openjdk11"

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