commit 74f25c2202af9f080da5a27407039b204deec16e
author Filip Pytloun <filip@pytloun.cz> Fri Jun 30 17:35:53 2017 +0200
committer Filip Pytloun <filip@pytloun.cz> Fri Jun 30 17:36:42 2017 +0200
tree a346f203750c18cd3dd55428363544fce19b9ee8
parent 1fc5779d6085e24f398a19009acce5dcdc17fb49

Configurable apt repository and registry for python-flask-hello

Change-Id: I3d95f25a8622a6f3920bc49497a6597aaa72fb48

jenkins/client/job/docker/testing.yml

diff --git a/jenkins/client/job/docker/testing.yml b/jenkins/client/job/docker/testing.yml
index c1184b6..78df826 100644
--- a/jenkins/client/job/docker/testing.yml
+++ b/jenkins/client/job/docker/testing.yml
@@ -1,4 +1,7 @@
 parameters:
+  _param:
+    jenkins_docker_registry_url: ""
+    jenkins_docker_registry_credentials: "dockerhub"
   jenkins:
     client:
       job_template:
@@ -34,6 +37,9 @@
               IMAGE_GIT_URL:
                 type: string
                 default: "${_param:jenkins_gerrit_url}/mk/python-flask-hello"
+              IMAGE_BUILD_PARAMS:
+                type: string
+                default: "--build-arg apt_repository='deb [arch=amd64] ${_param:jenkins_aptly_url}/trusty/ nightly extra' --build-arg apt_key_url=${_param:jenkins_aptly_url}/public.gpg"
               IMAGE_BRANCH:
                 type: string
                 default: "{{branch}}"
@@ -48,10 +54,10 @@
                 default: "{{dockerfile}}"
               REGISTRY_URL:
                 type: string
-                default: ""
+                default: "${_param:docker_registry_url}"
               REGISTRY_CREDENTIALS_ID:
                 type: string
-                default: "dockerhub"
+                default: "${_param:jenkins_docker_registry_credentials}"
               DOCKER_GIT_TAG:
                 type: boolean
                 default: "true"