summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-02-13 18:05:14 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-13 18:05:14 +0000
commit401eb82b80c01579f32565869d819a2155ce6bcf (patch)
tree2d1d4bf24b768f8260f2a8d5ba9cfd0935ad8dd6
parentf8d3548ab0cfd6b32db51aad9fe83518b1166aa9 (diff)
parent3fccd9b82a315430c48fbf1052297d16824012b6 (diff)
Merge "Add policy-api csit into Jenkins job list"
-rw-r--r--jjb/policy/policy-api.yaml11
-rw-r--r--jjb/policy/policy-csit.yaml16
2 files changed, 26 insertions, 1 deletions
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 9c2874b86..ccf18d31c 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -4,7 +4,16 @@
project-name: 'policy-api'
jobs:
- '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-merge-java':
+ docker-pom: 'pom.xml'
+ mvn-params: '-P docker'
+ build-node: ubuntu1604-docker-8c-8g
+ - '{project-name}-{stream}-docker-version-java-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ mvn-params: '-Dmaven.test.skip=true'
+ disabled: true
+ build-node: ubuntu1604-docker-8c-8g
project: 'policy/api'
stream:
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 90ee700cb..5692314a4 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -53,3 +53,19 @@
- 'policy-distribution-{stream}-merge-java'
robot-options: ''
branch: 'master'
+
+- project:
+ name: policy-api-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'policy'
+ stream:
+ - 'master':
+ branch: master
+ functionality:
+ - 'api'
+ trigger_jobs:
+ - 'policy-api-{stream}-merge-java'
+ robot-options: ''
+ branch: 'master'