Merge "Update cloud image CentOS7 builder x86_64"

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/global-jjb b/global-jjb
index c8b9acd166fcbd88139a65f7721e522980a0e013..92449c24828b0dbd582637ce3d1d705390da4126 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit c8b9acd166fcbd88139a65f7721e522980a0e013
+Subproject commit 92449c24828b0dbd582637ce3d1d705390da4126

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/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