summaryrefslogtreecommitdiffstats
path: root/jjb/portal
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/portal')
-rw-r--r--jjb/portal/portal-docker.yaml20
-rw-r--r--jjb/portal/portal-sdk.yaml29
-rw-r--r--jjb/portal/portal.yaml2
3 files changed, 11 insertions, 40 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'
diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal/portal-sdk.yaml
deleted file mode 100644
index 63304419d..000000000
--- a/jjb/portal/portal-sdk.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- project:
- name: portal-sdk
- project-name: 'portal-sdk'
- subproject:
- - 'ecomp-sdk':
- pom: 'ecomp-sdk/pom.xml'
- pattern: 'ecomp-sdk/**'
- subproject-name: 'ecomp-sdk'
-
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-java-daily'
- - '{project-name}-{stream}-stage-site-java':
- pom: 'ecomp-sdk/pom.xml'
- site-pom: 'ecomp-sdk/pom.xml'
- trigger-job: '{project-name}-{stream}-{subproject-name}-release-java-daily'
-
- project: 'portal/sdk'
- stream:
- - 'master':
- branch: 'master'
- - 'release-1.3.0':
- branch: 'release-1.3.0'
- mvn-settings: 'portal-sdk-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index ef05814cc..493136620 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'release-1.3.0':
+ branch: 'release-1.3.0'
mvn-settings: 'portal-settings'
files: '**'
archive-artifacts: ''