From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Wed, 19 Sep 2018 21:04:53 +0000 (-0400)
Subject: Update docker builds to use local ci repo server
X-Git-Tag: v5.0.0~121
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f3186d552b680b309004a608cc88c8e49fa9d545;p=osm%2Fdevops.git

Update docker builds to use local ci repo server

Change-Id: I86e03995ee56a62fa1e2d8063d5389dee57d57e1
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---

diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index ceaacaae..a918c9fb 100644
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -27,7 +27,7 @@ $(MKBUILD):
 	$Qmkdir -p $(MKBUILD)
 
 $(MKBUILD)/.dep_%:
-	$Q$(MKINCLUDE)/get_version.sh -m $* > $@
+	$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m $* > $@
 
 build: $(MKBUILD) $(DEPS_TARGETS)
 	$Qdocker build -t osm/$(LOWER_MDG):$(TAG) \
diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index fb4d5651..4949df88 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -156,7 +156,7 @@ node("${params.NODE}") {
     error = null
     if ( params.DO_BUILD ) {
         stage("Build") {
-            sh "make -j4 -C docker CMD_DOCKER_ARGS= TAG=${container_name}"
+            sh "make -j4 -C docker CMD_DOCKER_ARGS= TAG=${container_name} RELEASE=${params.RELEASE} REPOSITORY_BASE=${repo_base_url} REPOSITORY_KEY=${params.REPO_KEY_NAME} REPOSITORY=${params.REPOSITORY}"
         }
     }