Merge "[DMAAP] Add vrification jobs for BC"
diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
deleted file mode 100644
index 7da843a..0000000
--- a/jjb/dmaap/dmaap-buscontroller-csit.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- project:
- name: dmaap-buscontroller-csit
- jobs:
- - '{project-name}-{stream}-csit-{functionality}'
- - '{project-name}-{stream}-verify-csit-{functionality}'
- project-name: 'dmaap-buscontroller'
- recipients: 'fiachra.corcoran@est.tech'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'with_mr':
- trigger_jobs:
- - '{project-name}-maven-docker-stage-{stream}'
- - 'with_dr':
- trigger_jobs:
- - '{project-name}-maven-docker-stage-{stream}'
- robot-options: ''
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 68bffef..5531bb9 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -9,7 +9,6 @@
name: dmaap-buscontroller-java11
project-name: 'dmaap-buscontroller'
jobs:
- - '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- gerrit-maven-docker-stage:
build-node: ubuntu1804-docker-8c-8g
@@ -51,6 +50,45 @@
cron: ''
- project:
+ name: dmaap-buscontroller-csit
+ jobs:
+ - '{project-name}-review-verification-maven-{stream}':
+ mvn-goals: clean install
+ mvn-params: '-P docker -DskipTests=true'
+ - '{project-name}-merge-verification-maven-{stream}':
+ mvn-goals: clean install
+ mvn-params: '-P docker'
+ project-name: 'dmaap-buscontroller'
+ recipients: 'fiachra.corcoran@est.tech'
+ project: 'dmaap/buscontroller'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'honolulu':
+ branch: 'honolulu'
+ mvn-settings: 'dmaap-buscontroller-settings'
+ robot-options: ''
+
+- project:
+ name: dmaap-buscontroller-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: 'dmaap/buscontroller'
+ project-name: 'dmaap-buscontroller'
+ branch: 'master'
+ mvn-settings: 'dmaap-buscontroller-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
+
+- project:
name: dmaap-buscontroller-clm
jobs:
- gerrit-maven-clm
@@ -59,6 +97,7 @@
project-name: 'dmaap-buscontroller'
branch: 'master'
mvn-settings: 'dmaap-buscontroller-settings'
+ java-version: openjdk11
- project:
name: dmaap-buscontroller-info
diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml
deleted file mode 100644
index e991363..0000000
--- a/jjb/dmaap/dmaap-datarouter-csit.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- name: dmaap-datarouter-csit-ssl
- jobs:
- - '{project-name}-{stream}-csit-{functionality}'
- - '{project-name}-{stream}-verify-csit-{functionality}'
- project-name: 'dmaap-datarouter'
- recipients: 'fiachra.corcoran@est.tech'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'ssl-dr-suite':
- trigger_jobs:
- - '{project-name}-maven-docker-stage-{stream}'
- robot-options: ''
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index de41a48..b79f2ed 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -47,6 +47,22 @@
cron: ''
- project:
+ name: dmaap-datarouter-csit-ssl
+ jobs:
+ - '{project-name}-{stream}-csit-{functionality}'
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ project-name: 'dmaap-datarouter'
+ recipients: 'fiachra.corcoran@est.tech'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'ssl-dr-suite':
+ trigger_jobs:
+ - '{project-name}-maven-docker-stage-{stream}'
+ robot-options: ''
+
+- project:
name: dmaap-datarouter-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
deleted file mode 100644
index c711ecb..0000000
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
----
-- project:
- name: dmaap-dbcapi-java11
- project-name: 'dmaap-dbcapi'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'dmaap/dbcapi'
- mvn-settings: 'dmaap-dbcapi-settings'
- java-version: openjdk11
- stream:
- - 'master':
- branch: 'master'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
-
-- project:
- name: dmaap-dbcapi-java11-maintenance
- project-name: 'dmaap-dbcapi-maintenance'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- project: 'dmaap/dbcapi'
- mvn-settings: 'dmaap-dbcapi-settings'
- java-version: openjdk11
- stream:
- - 'honolulu':
- branch: 'honolulu'
- - 'guilin':
- branch: 'guilin'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- cron: ''
-
-- project:
- name: dmaap-dbcapi-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: 'dmaap/dbcapi'
- project-name: 'dmaap-dbcapi'
- branch: 'master'
- mvn-settings: 'dmaap-dbcapi-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- java-version: openjdk11
-
-- project:
- name: dmaap-dbcapi-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: dmaap/dbcapi
- project-name: 'dmaap-dbcapi'
- branch: 'master'
- mvn-settings: 'dmaap-dbcapi-settings'
- java-version: openjdk11
-
-- project:
- name: dmaap-dbcapi-info
- project-name: dmaap-dbcapi
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: dmaap/dbcapi
- branch: master
diff --git a/jjb/dmaap/dmaap-messagerouter-csit.yaml b/jjb/dmaap/dmaap-messagerouter-csit.yaml
deleted file mode 100644
index 109cbcc..0000000
--- a/jjb/dmaap/dmaap-messagerouter-csit.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- name: dmaap-csit
- jobs:
- - '{project-name}-{stream}-csit-{functionality}'
- - '{project-name}-{stream}-verify-csit-{functionality}'
- project-name: 'dmaap'
- recipients: 'fiachra.corcoran@est.tech'
- stream:
- - 'master':
- branch: 'master'
- functionality:
- - 'mrpubsub':
- trigger_jobs:
- - '{project-name}-maven-docker-stage-{stream}'
- robot-options: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 9190793..ddd8c40 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -50,6 +50,22 @@
cron: ''
- project:
+ name: dmaap-csit
+ jobs:
+ - '{project-name}-{stream}-csit-{functionality}'
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ project-name: 'dmaap'
+ recipients: 'fiachra.corcoran@est.tech'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'mrpubsub':
+ trigger_jobs:
+ - '{project-name}-maven-docker-stage-{stream}'
+ robot-options: ''
+
+- project:
name: dmaap-messagerouter-messageservice-sonar
jobs:
- gerrit-maven-sonar