summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2017-11-27 21:38:39 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-27 21:38:39 +0000
commitd78a2483576fcaadbcee58df81e3f4b8bf7aec53 (patch)
treecb7de4a6b777cb745001b27a9939d8a226404d9f
parentc4b1aad36eb8e3b701f4da149e6cfbe0db689f54 (diff)
parent61e59aac247697f32285b33cfe906a8a81b0b863 (diff)
Merge "Add policy amsterdam branch jobs"
-rw-r--r--jjb/policy/policy-common.yaml2
-rw-r--r--jjb/policy/policy-docker.yaml2
-rw-r--r--jjb/policy/policy-drools-applications.yaml3
-rw-r--r--jjb/policy/policy-drools-pdp.yaml3
-rw-r--r--jjb/policy/policy-engine.yaml4
5 files changed, 13 insertions, 1 deletions
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2df702731..a844d05e9 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -35,6 +35,8 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-common-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index 5f3b31dc3..f2b19e4a0 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -24,6 +24,8 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 44c6608da..f463a2cef 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -35,6 +35,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-drools-applications-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 7dce80e3c..ada359f0f 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -36,6 +36,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-drools-pdp-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 8fd4cd15a..ceb228eca 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -29,7 +29,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-stage-site-java':
- build-node: 'ubuntu1604-basebuild-4c-4g'
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
@@ -37,6 +36,9 @@
stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'policy-engine-settings'
files: '**'
archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'