From f3186d552b680b309004a608cc88c8e49fa9d545 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Wed, 19 Sep 2018 17:04:53 -0400 Subject: [PATCH] Update docker builds to use local ci repo server Change-Id: I86e03995ee56a62fa1e2d8063d5389dee57d57e1 Signed-off-by: Mike Marchetti --- docker/mk/Makefile.include | 2 +- jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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}" } } -- 2.25.1