summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild-docker-containers.sh3
-rw-r--r--jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml2
-rw-r--r--jjb/yaml/pippiandcarlos.com/openbook-database.yaml2
-rw-r--r--jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml2
4 files changed, 5 insertions, 4 deletions
diff --git a/build-docker-containers.sh b/build-docker-containers.sh
index 7a7f971..c7663b6 100755
--- a/build-docker-containers.sh
+++ b/build-docker-containers.sh
@@ -3,6 +3,7 @@
artifact="${1}"
branch="${2}"
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
@@ -35,7 +36,7 @@ sudo /root/openbook_build/ci/build.sh ${artifact}
# refresh openbook-v4-installer repo (ansible playbook)
pushd ${HOME}
-git clone git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git
+git clone ${installer_url}
sudo rsync -aq --delete --exclude=.git /root/openbook_build/ansible/ openbook-v4-installer/
sudo chown -R jenkins: openbook-v4-installer
pushd openbook-v4-installer/
diff --git a/jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml b/jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml
index 2ab74bb..3375dd1 100644
--- a/jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml
+++ b/jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml
@@ -18,4 +18,4 @@
- master
builders:
- shell: |
- ./build-docker-containers.sh baseimage unstable
+ ./build-docker-containers.sh baseimage unstable git@pippiandcarlos.com:repos/openbook-v4-installer.git
diff --git a/jjb/yaml/pippiandcarlos.com/openbook-database.yaml b/jjb/yaml/pippiandcarlos.com/openbook-database.yaml
index 70594de..e0d797c 100644
--- a/jjb/yaml/pippiandcarlos.com/openbook-database.yaml
+++ b/jjb/yaml/pippiandcarlos.com/openbook-database.yaml
@@ -18,4 +18,4 @@
- master
builders:
- shell: |
- ./build-docker-containers.sh database unstable
+ ./build-docker-containers.sh database unstable git@pippiandcarlos.com:repos/openbook-v4-installer.git
diff --git a/jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml b/jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml
index cd09544..da92048 100644
--- a/jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml
+++ b/jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml
@@ -129,7 +129,7 @@
stage("docker-container") {{
steps {{
git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/openbook-v4-ci.git")
- sh(script: "./build-docker-containers.sh {artifact} {branch}")
+ sh(script: "./build-docker-containers.sh {artifact} {branch} git@pippiandcarlos.com:repos/openbook-v4-installer.git")
}}
}}
}}