diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/appc/appc-master.yaml | 2 | ||||
| -rw-r--r-- | jjb/optf/optf-osdf.yaml | 8 | ||||
| -rw-r--r-- | jjb/policy/policy-api.yaml | 11 | ||||
| -rw-r--r-- | jjb/policy/policy-csit.yaml | 16 |
4 files changed, 31 insertions, 6 deletions
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 9ce758ea4..80b6df28c 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -37,7 +37,7 @@ jobs: - gerrit-maven-clm: mvn-params: '-DskipTests' - build-timeout: 30 + build-timeout: 60 build-node: ubuntu1604-builder-8c-8g nexus-iq-namespace: 'onap-' project: 'appc' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 762b078d4..f066dd824 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -30,8 +30,8 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': 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' |