From 52b543f4dc997b7d9908f598e7e44a98552b2cdd Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 12 Sep 2019 15:12:16 -0700 Subject: [PATCH] Upgrade global-jjb - Fetch release container updates - Fetch WhiteSource job fixes - Add container Jenkins env varaibles needed for self container releases Change-Id: I99896745ed0103279a93d8436c933b0a92181e0b Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall --- global-jjb | 2 +- jenkins-config/global-vars-production.sh | 2 ++ jenkins-config/global-vars-sandbox.sh | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/global-jjb b/global-jjb index 49914d6b5..c050ff286 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 49914d6b5bc5f50ed1592ee72ad9d62fa68ed3f4 +Subproject commit c050ff286514ec71f6aff75b71e3f870d7b36966 diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index 4fb913d8d..7b124aaab 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -1,3 +1,5 @@ +CONTAINER_PULL_REGISTRY=nexus3.onap.org:10003 +CONTAINER_PUSH_REGISTRY=nexus3.onap.org:10002 DOCKER_REGISTRY=nexus3.onap.org DOCKERHUB_REGISTRY=docker.io GERRIT_URL=https://gerrit.onap.org/r diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index 0e5d1c5fd..146fe6e64 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -1,3 +1,5 @@ +CONTAINER_PULL_REGISTRY=nexus3.onap.org:10003 +CONTAINER_PUSH_REGISTRY=nexus3.onap.org:10002 DOCKER_REGISTRY=nexus3.onap.org DOCKERHUB_REGISTRY=docker.io GERRIT_URL=https://gerrit.onap.org/r -- 2.16.6