commit b9c5a85809a24beaa6dbfd1bfa831fce4ce863c8
author Mikhail Ivanov <mivanov@mirantis.com> Wed Jun 21 15:13:37 2017 +0400
committer Mikhail Ivanov <mivanov@mirantis.com> Wed Jun 21 15:13:37 2017 +0400
tree 5d06d1ed889193e28f9805e68ad5f6be83d7c736
parent 89b124ec180fa47d093acb38010dcf130016fef5

Fix rundeck and devops-portal image building

- Add new CONTEXT_PATH variable

Change-Id: Id0b8f93e827b56b323befac1af4abd3bf2ed6a82

jenkins/client/job/docker/devops-portal.yml

diff --git a/jenkins/client/job/docker/devops-portal.yml b/jenkins/client/job/docker/devops-portal.yml
index 399586f..c4db406 100644
--- a/jenkins/client/job/docker/devops-portal.yml
+++ b/jenkins/client/job/docker/devops-portal.yml
@@ -44,12 +44,15 @@
             IMAGE_TAGS:
               type: string
               default: ""
+            CONTEXT_PATH:
+              type: string
+              default: "."
             CREDENTIALS_ID:
               type: string
               default: "gerrit"
             DOCKERFILE_PATH:
               type: string
-              default: "docker/devops-portal"
+              default: "docker/devops-portal/Dockerfile"
             DOCKER_REGISTRY:
               type: string
               default: "docker-dev-virtual.docker.mirantis.net"

jenkins/client/job/docker/rundeck.yml

diff --git a/jenkins/client/job/docker/rundeck.yml b/jenkins/client/job/docker/rundeck.yml
index 63d206f..cb1eadb 100644
--- a/jenkins/client/job/docker/rundeck.yml
+++ b/jenkins/client/job/docker/rundeck.yml
@@ -44,12 +44,15 @@
             IMAGE_TAGS:
               type: string
               default: ""
+            CONTEXT_PATH:
+              type: string
+              default: "."
             CREDENTIALS_ID:
               type: string
               default: "gerrit"
             DOCKERFILE_PATH:
               type: string
-              default: "."
+              default: ""
             DOCKER_REGISTRY:
               type: string
               default: "docker-dev-virtual.docker.mirantis.net"