summaryrefslogtreecommitdiffstats
path: root/jjb/portal/portal-docker.yaml
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-10-25 16:51:02 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-10-26 10:40:38 -0400
commit6b6ae12c6c95c98c5414ef3bc8c56341c05eb79e (patch)
treecd828cd2897aa3cd7197315a9e70ad3bfcfa8c08 /jjb/portal/portal-docker.yaml
parentf6fb3de8789a67b54cfc48505f8baf261e165855 (diff)
Add 1.3.0 job for Portal-Docker
Revise and rename several global three-scm jobs down to two-scm; they are only used by Portal. Issue: PORTAL-134 Change-Id: I5bf19bbded1c2ddcacf79ef71cd5fd8e4f7b172d Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'jjb/portal/portal-docker.yaml')
-rw-r--r--jjb/portal/portal-docker.yaml20
1 files changed, 9 insertions, 11 deletions
diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index 712e490e2..71edff8d7 100644
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -4,28 +4,26 @@
name: portal-docker
project-name: 'portal-docker'
jobs:
- - '{project-name}-{stream}-three-scm-verify-script':
+ - '{project-name}-{stream}-two-scm-verify-script':
script:
!include-raw-escape: 'docker-build-deploy.sh'
- - '{project-name}-{stream}-merge-docker-script':
+ - '{project-name}-{stream}-two-scm-merge-docker-script':
script:
!include-raw-escape: 'docker-build-push.sh'
- - '{project-name}-{stream}-release-docker-script-manual':
+ - '{project-name}-{stream}-two-scm-release-docker-script-manual':
script:
!include-raw-escape: 'docker-build-release.sh'
project: 'portal'
stream:
- 'master':
branch: 'master'
+ - 'release-1.3.0':
+ branch: 'release-1.3.0'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-docker-8c-8g
- extra-project1: 'portal/sdk'
- extra-branch1: '{branch}'
- extra-refspec1: 'refs/heads/{branch}'
- checkout-dir1: 'sdk'
- extra-project2: 'ui/dmaapbc'
- extra-branch2: '{branch}'
- extra-refspec2: 'refs/heads/{branch}'
- checkout-dir2: 'dmaapbc'
+ extra-project: 'portal/sdk'
+ extra-branch: '{branch}'
+ extra-refspec: 'refs/heads/{branch}'
+ checkout-dir: 'sdk'