summaryrefslogtreecommitdiffstats
path: root/jjb/portal/portal-docker.yaml
diff options
context:
space:
mode:
authortalasila <talasila@research.att.com>2017-02-19 16:53:26 -0500
committertalasila <talasila@research.att.com>2017-02-19 17:21:21 -0500
commitbbf73015e5e7eb2ff45a6370216ebf09f1d45db3 (patch)
tree153609afc075d25fef1bdeb4e317b59b18b285f3 /jjb/portal/portal-docker.yaml
parent811a573cf02ee2777373e451c1356e9aac988055 (diff)
portal's merge docker push job added
Change-Id: I960faa37090e981cf473fd7f6582efe9b540fec7 Signed-off-by: talasila <talasila@research.att.com>
Diffstat (limited to 'jjb/portal/portal-docker.yaml')
-rw-r--r--jjb/portal/portal-docker.yaml9
1 files changed, 6 insertions, 3 deletions
diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index 8f9c447c5..33e850c2b 100644
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -4,7 +4,12 @@
name: portal-docker
project-name: 'portal-docker'
jobs:
- - '{project-name}-{stream}-three-scm-verify-script'
+ - '{project-name}-{stream}-three-scm-verify-script':
+ script:
+ !include-raw-escape: 'docker-build-deploy.sh'
+ - '{project-name}-{stream}-merge-docker-script':
+ script:
+ !include-raw-escape: 'docker-build-push.sh'
project: 'portal'
stream:
@@ -22,5 +27,3 @@
extra-branch2: 'master'
extra-refspec2: 'refs/heads/{branch}'
checkout-dir2: 'dmaapbc'
- script:
- !include-raw-escape: 'docker-build-deploy.sh'