Merge "CI: Add docker verify/merge jobs"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ca5cf7fbb4f65c9a3e61a06eb35a823f8fa143c3..e15b6fde97d51b5a9b24e9fd50208ff21b4de46a 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -46,7 +46,7 @@ repos:
     hooks:
       - id: bandit
         # Bandit does not need to run on test code
-        exclude: tests/*
+        exclude: ^tests/
 
   - repo: https://github.com/pycqa/pydocstyle
     rev: 5.0.2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
index 7e4888468c068d670a43eae537a09f0a681050e5..19d49cd8a0fa2adcb98e603007a5354973cc0cae 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
index 3574e52b72a23f9694782ddfa8b931db0bb6c528..5d47f67811751f7f39c41b92abfc84f8ec076846 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
index c38bb96046051ca01d5d2c1dd14e4f79c22f587d..6cf952749a52d5ca5a98444837450b03ad704880 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index 7a15b9eb01e5593f0cba615801a1decbe6927580..2c399aaeb645d400d8dff1c2e3445267cf143b53 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
index e38ee2904ca4e429fa7f6523af8442261fd05b2f..92d3ff784a40aab15f8f7b165580ee752869f2ea 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
index 7e77396d6113bad620fef6b5a81a56870f8d9758..3814e4e4c9efc56e55a1fa92fdafc5507ffc714a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index b53355dd4bc31404afc6474876b489d79f7fbe7f..b21662f9b9d35cb8bc61f9d9e1fe717d8aac6d82 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683
 HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
index 01d60e60a2875ad06863bcfd61153881af1f3c72..7ebfed2ea9851d91bd5285e0beec59b33267706a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-mininet-ovs-28-1c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=ubuntu1804-mininet-ovs-28-1c-4g
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210329-150700.140
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210608-222826.097
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh
index c88abcc709a146d337749f1e871a30be8ea38cd1..66104cd33fe012d93b56e99ea09440f5be4eff3f 100644 (file)
--- a/jenkins-config/global-vars-releng.sh
+++ b/jenkins-config/global-vars-releng.sh
@@ -1,3 +1,7 @@
+CONTAINER_PULL_REGISTRY=nexus3.opendaylight.org:10003
+CONTAINER_PUSH_REGISTRY=nexus3.opendaylight.org:10002
+DOCKER_REGISTRY=nexus3.opendaylight.org
+DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://git.opendaylight.org/gerrit
 GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT
 GIT_URL=git://devvexx.opendaylight.org/mirror
@@ -5,6 +9,7 @@ JENKINS_HOSTNAME=vex-yul-odl-jenkins-1
 LOGS_SERVER=https://logs.opendaylight.org
 NEXUS_URL=https://nexus.opendaylight.org
 ODLNEXUSPROXY=https://nexus.opendaylight.org
+REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_USERNAME=odl-release
 RELEASE_EMAIL=collab-it+odl-release@linuxfoundation.org
 SIGUL_BRIDGE_IP=10.30.168.3

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index daff1d384f969510b724672b1d63b0c8d7c46acf..290fc69c42bd8b2bf32c52192fbd5ac7ed39cd72 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -1,3 +1,7 @@
+CONTAINER_PULL_REGISTRY=nexus3.opendaylight.org:10003
+CONTAINER_PUSH_REGISTRY=nexus3.opendaylight.org:10002
+DOCKER_REGISTRY=nexus3.opendaylight.org
+DOCKERHUB_REGISTRY=docker.io
 GERRIT_URL=https://git.opendaylight.org/gerrit
 GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT
 GIT_URL=git://devvexx.opendaylight.org/mirror
@@ -5,6 +9,7 @@ JENKINS_HOSTNAME=vex-yul-odl-jenkins-2
 LOGS_SERVER=https://logs.opendaylight.org
 NEXUS_URL=https://nexus.opendaylight.org
 ODLNEXUSPROXY=https://nexus.opendaylight.org
+REGISTRY_PORTS=10001 10002 10003 10004
 SIGUL_BRIDGE_IP=10.30.168.3
 SIGUL_KEY=odl-sandbox
 SILO=sandbox

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 713bcc0b90f3d64743560998a14b76c9322b39d0..63b6f381e7e3efb3d672cf32ae54b37632c6a3e5 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -101,7 +101,7 @@
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210401-060141.809"
+    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20210608-222854.683"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"
@@ -111,9 +111,9 @@
     openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
     tools_system_count: 1
     tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210329-150700.140"
+    tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20210608-222826.097"
     openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20210401-010130.589"
-    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200813-042753.841"
+    openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20210608-222908.760"
     openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207"
 
     # Default Robot framework options

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 0c1e5346cc5dd6cd44eae759ffa1cfb8e12e19d0..2f07ab50c1efb377c16fc4db63464cb9d921b2db 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -10,6 +10,7 @@
       - gerrit-tox-verify:
           build-timeout: 240
           build-node: centos7-builder-4c-16g
+          parallel: true
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs