summaryrefslogtreecommitdiffstats
path: root/jjb/optf
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-02-16 18:08:06 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-16 18:08:06 +0000
commit347807e450b5f9499f52228a87d5d4871a175e41 (patch)
treef1dddf537bd4cd05b6f85f8828d50924607822c7 /jjb/optf
parent23219aedd43737e3220be28502f6f9abde6a3314 (diff)
parentb582e216e4aacb967619465388e4a7381f12ce6b (diff)
Merge "Add merge job for optf-has"
Diffstat (limited to 'jjb/optf')
-rw-r--r--jjb/optf/optf-has-python.yaml16
-rw-r--r--jjb/optf/optf-has.yaml34
2 files changed, 34 insertions, 16 deletions
diff --git a/jjb/optf/optf-has-python.yaml b/jjb/optf/optf-has-python.yaml
deleted file mode 100644
index 81b215d67..000000000
--- a/jjb/optf/optf-has-python.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- name: optf-has
- project-name: 'optf-has'
- project: 'optf/has'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'optf-has-settings'
- build-node: 'ubuntu1604-basebuild-4c-4g'
- subproject:
- - 'conductor':
- path: 'conductor'
- pattern: 'conductor/**'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
new file mode 100644
index 000000000..77a7443cf
--- /dev/null
+++ b/jjb/optf/optf-has.yaml
@@ -0,0 +1,34 @@
+---
+- project:
+ name: optf-has
+ project-name: 'optf-has'
+ project: 'optf/has'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'optf-has-settings'
+ subproject:
+ - 'conductor':
+ path: 'conductor'
+ pattern: 'conductor/**'
+ pom: 'pom.xml'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-python'
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-basebuild-4c-4g'
+- project:
+ name: optf-has-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-basebuild-4c-4g
+ project: 'optf/has'
+ project-name: 'optf-has'
+ branch: 'master'
+ mvn-settings: 'optf-has-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'