From: Luis Gomez Date: Fri, 18 Jun 2021 20:55:40 +0000 (+0000) Subject: Merge "Update cloud image CentOS7 builder x86_64" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8eb9f3705d61488d05eeac23a14368086cefb8f9;hp=66975e6857c04bb4b6c57130bcf593263ed97409;p=releng%2Fbuilder.git Merge "Update cloud image CentOS7 builder x86_64" --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ca5cf7fbb..e15b6fde9 100644 --- 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 c8b9acd16..92449c248 160000 --- 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 c88abcc70..66104cd33 100644 --- 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 daff1d384..290fc69c4 100644 --- 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 0c1e5346c..2f07ab50c 100644 --- 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