summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
f6fb3de)
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>
# vim: sw=2 ts=2 sts=2 et :
- job-template:
# vim: sw=2 ts=2 sts=2 et :
- job-template:
- # Job template for scm and script trigger - for docker merge
+ # Job template for two scm and script trigger - for docker merge
#
# Required Variables:
# branch: git branch
# build-node: what build node to run on
# script: build script to execute
#
# Required Variables:
# branch: git branch
# build-node: what build node to run on
# script: build script to execute
- name: '{project-name}-{stream}-merge-docker-script'
+ name: '{project-name}-{stream}-two-scm-merge-docker-script'
project-type: freestyle
concurrent: true
project-type: freestyle
concurrent: true
choosing-strategy: 'default'
submodule-recursive: '{submodule-recursive}'
- git-extra-project:
choosing-strategy: 'default'
submodule-recursive: '{submodule-recursive}'
- git-extra-project:
- project: '{extra-project1}'
- refspec: '{extra-refspec1}'
- branch: '{extra-branch1}'
- checkout-dir: '{checkout-dir1}'
- - git-extra-project:
- project: '{extra-project2}'
- refspec: '{extra-refspec2}'
- branch: '{extra-branch2}'
- checkout-dir: '{checkout-dir2}'
+ project: '{extra-project}'
+ refspec: '{extra-refspec}'
+ branch: '{extra-branch}'
+ checkout-dir: '{checkout-dir}'
wrappers:
- infra-wrappers:
wrappers:
- infra-wrappers:
maven-version: '{maven-version}'
- job-template:
maven-version: '{maven-version}'
- job-template:
- # Job template for scm and script trigger - for docker daily release
+ # Job template for two scm and script trigger - for docker daily release
#
# Required Variables:
# branch: git branch
# build-node: what build node to run on
# script: build script to execute
#
# Required Variables:
# branch: git branch
# build-node: what build node to run on
# script: build script to execute
- name: '{project-name}-{stream}-release-docker-script-manual'
+ name: '{project-name}-{stream}-two-scm-release-docker-script-manual'
project-type: freestyle
concurrent: true
project-type: freestyle
concurrent: true
choosing-strategy: 'default'
submodule-recursive: '{submodule-recursive}'
- git-extra-project:
choosing-strategy: 'default'
submodule-recursive: '{submodule-recursive}'
- git-extra-project:
- project: '{extra-project1}'
- refspec: '{extra-refspec1}'
- branch: '{extra-branch1}'
- checkout-dir: '{checkout-dir1}'
- - git-extra-project:
- project: '{extra-project2}'
- refspec: '{extra-refspec2}'
- branch: '{extra-branch2}'
- checkout-dir: '{checkout-dir2}'
+ project: '{extra-project}'
+ refspec: '{extra-refspec}'
+ branch: '{extra-branch}'
+ checkout-dir: '{checkout-dir}'
wrappers:
- infra-wrappers:
wrappers:
- infra-wrappers:
name: portal-docker
project-name: 'portal-docker'
jobs:
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'
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'
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'
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
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'