commit a6cc3bbdee233846c3aedba7d9de29255f1ab74b
author Jakub Josef <jjosef@mirantis.com> Fri Apr 27 12:25:09 2018 +0000
committer Gerrit Code Review <gerrit2@85b573a3ca36> Fri Apr 27 12:25:09 2018 +0000
tree 4c39b6c9e10af68f4db27b27f5638b7d85be30ff
parent ec2d5a695274a4d817517879fc5b5387b8688675
parent 5c135bbe920b1f5f7697891f87edceaaec82dc78

Merge "Added necessary params for upload docker images to artifactory"

jenkins/client/job/docker/build-images.yml

diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index 12c84c1..adc1ba8 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -59,6 +59,14 @@
               DOCKER_GIT_TAG:
                 type: boolean
                 default: "true"
+              ARTIFACTORY_URL:
+                type: string
+                default: "docker-dev-virtual.docker.mirantis.net"
+                description: "URL to artifactory"
+              ARTIFACTORY_NAMESPACE:
+                type: string
+                default: cicd
+                description: "Artifactory namespace (oss, cicd,...)"
               EXTRA_REPO_URL:
                 type: string
                 default: "${_param:jenkins_aptly_url}"

jenkins/client/job/docker/init.yml

diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index e3619b1..00411fb 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -98,6 +98,14 @@
               REGISTRY_CREDENTIALS_ID:
                 type: string
                 default: "mirantis-dockerhub"
+              ARTIFACTORY_URL:
+                type: string
+                default: "docker-dev-virtual.docker.mirantis.net"
+                description: "URL to artifactory"
+              ARTIFACTORY_NAMESPACE:
+                type: string
+                default: cicd
+                description: "Artifactory namespace (oss, cicd,...)"
               DOCKER_GIT_TAG:
                 type: boolean
                 default: "true"