From 5b05f00519f0d16e49dccfa2e9f34525cf62de4c Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Fri, 8 Dec 2017 10:04:57 -0700 Subject: Pass in the openbook-v4-installer git URL --- build-docker-containers.sh | 2 +- jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml | 2 +- jjb/yaml/verizoncloudplatform.com/openbook-database.yaml | 2 +- jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-docker-containers.sh b/build-docker-containers.sh index c7663b6..b704372 100755 --- a/build-docker-containers.sh +++ b/build-docker-containers.sh @@ -2,8 +2,8 @@ artifact="${1}" branch="${2}" +installer_url="${3}" buildroot="$(pwd)" -installer_url="${3:git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git}" # clean docker containers for i in $(sudo docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do diff --git a/jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml b/jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml index d42cd60..abbfb11 100644 --- a/jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml +++ b/jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml @@ -17,4 +17,4 @@ - master builders: - shell: | - ./build-docker-containers.sh baseimage unstable + ./build-docker-containers.sh baseimage unstable git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git diff --git a/jjb/yaml/verizoncloudplatform.com/openbook-database.yaml b/jjb/yaml/verizoncloudplatform.com/openbook-database.yaml index dd5bcda..b7a723f 100644 --- a/jjb/yaml/verizoncloudplatform.com/openbook-database.yaml +++ b/jjb/yaml/verizoncloudplatform.com/openbook-database.yaml @@ -17,4 +17,4 @@ - master builders: - shell: | - ./build-docker-containers.sh database unstable + ./build-docker-containers.sh database unstable git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git diff --git a/jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml b/jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml index a8ab511..5850cfd 100644 --- a/jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml +++ b/jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml @@ -129,7 +129,7 @@ stage("docker-container") {{ steps {{ git(poll: false, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/openbook-v4-ci.git") - sh(script: "./build-docker-containers.sh {artifact} {branch}") + sh(script: "./build-docker-containers.sh {artifact} {branch} git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git") }} }} }} -- cgit v1.3