From 7f18603f3b20316ea0be94c5c2e3c06b8b737fc4 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Wed, 19 Sep 2018 17:09:05 -0400 Subject: [PATCH] Fix repo base url to return only url Change-Id: Ic7e3faf53fd193a3075352430fa43f74c7aa3e85 Signed-off-by: Mike Marchetti --- jenkins/ci-pipelines/ci_helper.groovy | 2 +- jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/ci-pipelines/ci_helper.groovy b/jenkins/ci-pipelines/ci_helper.groovy index 32967f56..1e724ff7 100644 --- a/jenkins/ci-pipelines/ci_helper.groovy +++ b/jenkins/ci-pipelines/ci_helper.groovy @@ -58,7 +58,7 @@ def lxc_file_push(container_name,file,destination) { def start_http_server(repo_dir,server_name) { sh "docker run -dit --name ${server_name} -v ${repo_dir}:/usr/local/apache2/htdocs/ httpd:2.4" def http_server_ip = sh(returnStdout:true, script: "docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${server_name}").trim() - return "-u http://${http_server_ip}/" + return "http://${http_server_ip}/" } def lxc_get_file(container_name,file,destination) { diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 4949df88..1b4dc13e 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} RELEASE=${params.RELEASE} REPOSITORY_BASE=${repo_base_url} REPOSITORY_KEY=${params.REPO_KEY_NAME} REPOSITORY=${params.REPOSITORY}" + 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.REPO_DISTRO}" } } -- 2.25.1