summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-05-31 18:59:27 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-31 18:59:27 +0000
commit54a25d43c770073d3eaf633274b160cf533c4042 (patch)
tree5b29411cb912a800a14c692b56fbced82b55d9ac /jjb
parent5d1e017831b223fa7c4ce3e475a83dbb3197fe50 (diff)
parent82b94aa58adbf9e03466441fc48e45a866bd76c1 (diff)
Merge "Update SDC job"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/sdc/sdc-csit.yaml2
-rw-r--r--jjb/sdc/sdc-jtosca.yaml4
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml4
-rw-r--r--jjb/sdc/sdc-sdc-docker-base.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml4
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml2
-rw-r--r--jjb/sdc/sdc.yaml4
7 files changed, 18 insertions, 4 deletions
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index d306182a6..0e2041473 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -8,6 +8,8 @@
stream:
- 'master':
branch: 'master'
+ - 'beijing':
+ branch: 'beijing'
functionality:
- 'sanity':
trigger_jobs:
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index e9dbe6043..1aeae3a47 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'beijing':
+ branch: 'beijing'
mvn-settings: 'sdc-jtosca-settings'
files: '**'
archive-artifacts: ''
@@ -27,4 +29,4 @@
branch: 'master'
mvn-settings: 'sdc-jtosca-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index d6b9f8078..26d50848f 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'beijing':
+ branch: 'beijing'
mvn-settings: 'sdc-sdc-distribution-client-settings'
files: '**'
archive-artifacts: ''
@@ -27,4 +29,4 @@
branch: 'master'
mvn-settings: 'sdc-sdc-distribution-client-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 4cc78ed51..766d0af47 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'beijing':
+ branch: 'beijing'
mvn-settings: 'sdc-sdc-docker-base-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 2ff56969c..b0e852a0a 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'beijing':
+ branch: 'beijing'
mvn-settings: 'sdc-sdc-tosca-settings'
files: '**'
archive-artifacts: ''
@@ -27,4 +29,4 @@
branch: 'master'
mvn-settings: 'sdc-sdc-tosca-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 35ee0a7a8..87ec02080 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'beijing':
+ branch: 'beijing'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 2535ee0c1..09e70ffc0 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -18,6 +18,8 @@
stream:
- 'master':
branch: 'master'
+ - 'beijing':
+ branch: 'beijing'
mvn-settings: 'sdc-settings'
files: '**'
archive-artifacts: ''
@@ -34,4 +36,4 @@
mvn-settings: 'sdc-settings'
mvn-params: '-Djacoco.skip=false'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file