Merge "[DMAAP] Add/remove branch merge jobs"
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
new file mode 100644
index 0000000..5111d81
--- /dev/null
+++ b/jjb/ccsdk/sli.yaml
@@ -0,0 +1,89 @@
+---
+- project:
+ name: ccsdk-sli
+ project-name: 'ccsdk-sli'
+ jobs:
+ - gerrit-maven-verify
+ - gerrit-maven-merge:
+ cron: '@daily'
+ - gerrit-maven-stage:
+ build-node: centos7-builder-4c-4g
+ sign-artifacts: true
+ cron: ''
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+ project: 'ccsdk/sli'
+ stream:
+ - 'master':
+ branch: 'master'
+ java-version: openjdk11
+ mvn-version: 'mvn36'
+ mvn-settings: 'ccsdk-sli-settings'
+ # due to a strange macro / variable translation problem this needs to be
+ # passed as a string block to properly get the properties correctly defined
+ # in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1804-builder-4c-4g
+ mvn-snapshot-id: 'ecomp-snapshots'
+ nexus-snapshot-repo: 'snapshots'
+
+- project:
+ name: ccsdk-sli-sonar
+ jobs:
+ - gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: '{sonar_mvn_goal}'
+ cron: '@daily'
+ build-node: ubuntu1804-builder-4c-4g
+ project: 'ccsdk/sli'
+ project-name: 'ccsdk-sli'
+ branch: 'master'
+ java-version: openjdk11
+ mvn-version: 'mvn36'
+ mvn-settings: 'ccsdk-sli-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: ccsdk-sli-clm
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: 'ccsdk/sli'
+ project-name: 'ccsdk-sli'
+ stream:
+ - 'master':
+ branch: 'master'
+ java-version: openjdk11
+ mvn-version: 'mvn36'
+ mvn-settings: 'ccsdk-sli-settings'
+ build-node: ubuntu1804-builder-4c-4g
+
+- project:
+ name: ccsdk-sli-info
+ project-name: ccsdk-sli
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: ccsdk/sli
+ branch: master
+
+- project:
+ name: ccsdk-sli-whitesource
+ project-name: ccsdk-sli
+ jobs:
+ - gerrit-whitesource-scan
+ java-version: openjdk11
+ mvn-version: 'mvn36'
+ mvn-settings: 'ccsdk-sli-settings'
+ wss-product-name: ccsdk
+ mvn-clean-install: true
+ project: ccsdk/sli
+ branch: master
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index aea005d..078cb59 100644
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -7,7 +7,7 @@
branch: 'master'
project: 'integration/simulators/ran-simulator'
mvn-settings: 'integration-simulators-ran-simulator-settings'
- files: '**'
+ files: 'ransim/**'
maven-deploy-properties: |
deployAtEnd=true
archive-artifacts: ''
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index ca2279e..c4c388f 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -8,6 +8,8 @@
stream:
- "master":
branch: "master"
+ - "guilin":
+ branch: "guilin"
functionality:
- "certservice":
trigger_jobs:
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 5bcd5f3..d4602e3 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -20,6 +20,9 @@
- 'master':
branch: 'master'
java-version: openjdk11
+ - 'guilin':
+ branch: 'guilin'
+ java-version: openjdk11
project: 'oom/platform/cert-service'
mvn-settings: 'oom-platform-cert-service-settings'
files: '**'