Merge "Remove amsterdam csit jobs"
diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml
new file mode 100644
index 0000000..a4c514a
--- /dev/null
+++ b/jjb/aaf/aaf-luaplugin.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: aaf-luaplugin
+ project-name: 'aaf-luaplugin'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aaf/luaplugin'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aaf-luaplugin-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index 0cec006..81aea74 100644
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -4,6 +4,7 @@
project-name: 'aaf-sms'
path: 'sms-service/src/sms'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-golang'
- '{project-name}-{stream}-merge-golang'
project: 'aaf/sms'
@@ -13,4 +14,4 @@
mvn-settings: 'aaf-sms-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
new file mode 100644
index 0000000..f48c2cf
--- /dev/null
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aaf-sshsm
+ project-name: 'aaf-sshsm'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aaf/sshsm'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aaf-sshsm-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/aai/aai-aai-config.yaml
new file mode 100644
index 0000000..12a4039
--- /dev/null
+++ b/jjb/aai/aai-aai-config.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-aai-config
+ project-name: 'aai-aai-config'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/aai-config'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-aai-config-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/aai/aai-aai-data.yaml
new file mode 100644
index 0000000..ad95f6a
--- /dev/null
+++ b/jjb/aai/aai-aai-data.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-aai-data
+ project-name: 'aai-aai-data'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/aai-data'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-aai-data-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-eis.yaml b/jjb/aai/aai-eis.yaml
new file mode 100644
index 0000000..cfb93fe
--- /dev/null
+++ b/jjb/aai/aai-eis.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-eis
+ project-name: 'aai-eis'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/eis'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-eis-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-gap.yaml b/jjb/aai/aai-gap.yaml
new file mode 100644
index 0000000..320bdd6
--- /dev/null
+++ b/jjb/aai/aai-gap.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-gap
+ project-name: 'aai-gap'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/gap'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-gap-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
new file mode 100644
index 0000000..69b1daf
--- /dev/null
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-graphadmin
+ project-name: 'aai-graphadmin'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/graphadmin'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-graphadmin-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
new file mode 100644
index 0000000..548d1a2
--- /dev/null
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-graphgraph
+ project-name: 'aai-graphgraph'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/graphgraph'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-graphgraph-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
new file mode 100644
index 0000000..4dd6e41
--- /dev/null
+++ b/jjb/aai/aai-spike.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-spike
+ project-name: 'aai-spike'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/spike'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-spike-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-tabular-data-service.yaml b/jjb/aai/aai-tabular-data-service.yaml
new file mode 100644
index 0000000..3e7c192
--- /dev/null
+++ b/jjb/aai/aai-tabular-data-service.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-tabular-data-service
+ project-name: 'aai-tabular-data-service'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/tabular-data-service'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-tabular-data-service-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/aai/aai-test-config.yaml b/jjb/aai/aai-test-config.yaml
new file mode 100644
index 0000000..dfdb22b
--- /dev/null
+++ b/jjb/aai/aai-test-config.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: aai-test-config
+ project-name: 'aai-test-config'
+ jobs:
+ - gerrit-maven-clm
+ project: 'aai/test-config'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-test-config-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
new file mode 100644
index 0000000..7ecc786
--- /dev/null
+++ b/jjb/appc/appc-cdt.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: appc-cdt
+ project-name: 'appc-cdt'
+ jobs:
+ - gerrit-maven-clm
+
+ project: 'appc/cdt'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'appc-cdt-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index f3c8690..0ab3d0e 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -20,8 +20,6 @@
stream:
- 'master':
branch: 'master'
- - 'amsterdam':
- branch: 'amsterdam'
mvn-settings: 'cli-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index 97a8c7f..10f1046 100644
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -18,6 +18,7 @@
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-verify-java-skip-tests':
mvn-goals: 'clean install'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
new file mode 100644
index 0000000..d7117bd
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: dcaegen2-analytics-flink
+ project-name: 'dcaegen2-analytics-flink'
+ jobs:
+ - gerrit-maven-clm
+ project: 'dcaegen2/analytics/flink'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dcaegen2-analytics-flink-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
new file mode 100644
index 0000000..b73be48
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: dcaegen2-analytics-pnda
+ project-name: 'dcaegen2-analytics-pnda'
+ jobs:
+ - gerrit-maven-clm
+ project: 'dcaegen2/analytics/pnda'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dcaegen2-analytics-pnda-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
deleted file mode 100644
index f29623f..0000000
--- a/jjb/dcaegen2/dcaegen2-analytics.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- project:
- name: dcaegen2-analytics
- project-name: 'dcaegen2-analytics'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'dcaegen2/analytics'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-analytics-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: 'ubuntu1604-docker-8c-8g'
-- project:
- name: dcaegen2-analytics-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2/analytics'
- project-name: 'dcaegen2-analytics'
- branch: 'master'
- mvn-settings: 'dcaegen2-analytics-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 42c7aa0..134240d 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-collectors-snmptrap
project-name: 'dcaegen2-collectors-snmptrap'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -31,4 +32,4 @@
branch: 'master'
mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index f5c28cc..a648604 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-collectors-ves
project-name: 'dcaegen2-collectors-ves'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
deleted file mode 100644
index a22308e..0000000
--- a/jjb/dcaegen2/dcaegen2-collectors.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- project:
- name: dcaegen2-collectors
- project-name: 'dcaegen2-collectors'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'dcaegen2/collectors'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-collectors-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: 'ubuntu1604-docker-8c-8g'
-- project:
- name: dcaegen2-collectors-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2/collectors'
- project-name: 'dcaegen2-collectors'
- branch: 'master'
- mvn-settings: 'dcaegen2-collectors-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 890d21c..a83a10f 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-deployments
project-name: 'dcaegen2-deployments'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -20,15 +21,3 @@
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-docker-8c-8g'
-- project:
- name: dcaegen2-deployments-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2/deployments'
- project-name: 'dcaegen2-deployments'
- branch: 'master'
- mvn-settings: 'dcaegen2-deployments-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 785bad3..d459663 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-blueprints
project-name: 'dcaegen2-platform-blueprints'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -20,15 +21,3 @@
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-docker-8c-8g'
-- project:
- name: dcaegen2-platform-blueprints-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2/platform/blueprints'
- project-name: 'dcaegen2-platform-blueprints'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-blueprints-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
index 5b94d30..c7cf8db 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-cdapbroker
project-name: 'dcaegen2-platform-cdapbroker'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -20,15 +21,3 @@
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-docker-8c-8g'
-- project:
- name: dcaegen2-platform-cdapbroker-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2/platform/cdapbroker'
- project-name: 'dcaegen2-platform-cdapbroker'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-cdapbroker-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
index 4959739..6424e11 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-cli
project-name: 'dcaegen2-platform-cli'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -31,4 +32,4 @@
branch: 'master'
mvn-settings: 'dcaegen2-platform-cli-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index e83dba3..9266802 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-configbinding
project-name: 'dcaegen2-platform-configbinding'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index e02af92..f5dcd9d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-deployment-handler
project-name: 'dcaegen2-platform-deployment-handler'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -20,15 +21,3 @@
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-docker-8c-8g'
-- project:
- name: dcaegen2-platform-deployment-handler-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2/platform/deployment-handler'
- project-name: 'dcaegen2-platform-deployment-handler'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 0539d9c..27632c8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-inventory-api
project-name: 'dcaegen2-platform-inventory-api'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 6dbfec5..70bc7ef 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-plugins
project-name: 'dcaegen2-platform-plugins'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index c6920c5..838638d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-policy-handler
project-name: 'dcaegen2-platform-policy-handler'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 4b6becf..33fcb11 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-platform-servicechange-handler
project-name: 'dcaegen2-platform-servicechange-handler'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -24,15 +25,3 @@
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-docker-8c-8g'
-- project:
- name: dcaegen2-platform-servicechange-handler-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2/platform/servicechange-handler'
- project-name: 'dcaegen2-platform-servicechange-handler'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
deleted file mode 100644
index 69e8985..0000000
--- a/jjb/dcaegen2/dcaegen2-platform.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- project:
- name: dcaegen2-platform
- project-name: 'dcaegen2-platform'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'dcaegen2/platform'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-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: ''
-- project:
- name: dcaegen2-platform-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2/platform'
- project-name: 'dcaegen2-platform'
- branch: 'master'
- mvn-settings: 'dcaegen2-platform-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
new file mode 100644
index 0000000..e3d8fba
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: dcaegen2-services-heartbeat
+ project-name: 'dcaegen2-services-heartbeat'
+ jobs:
+ - gerrit-maven-clm
+ project: 'dcaegen2/services/heartbeat'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dcaegen2-services-heartbeat-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
new file mode 100644
index 0000000..4b6bf1e
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: dcaegen2-services-mapper
+ project-name: 'dcaegen2-services-mapper'
+ jobs:
+ - gerrit-maven-clm
+ project: 'dcaegen2/services/mapper'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dcaegen2-services-mapper-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index cb94285..f91a4c2 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -3,6 +3,7 @@
name: dcaegen2-utils
project-name: 'dcaegen2-utils'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index 98ed256..e84df66 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -20,16 +20,3 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
-- project:
- name: dcaegen2-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'dcaegen2'
- project-name: 'dcaegen2'
- branch: 'master'
- mvn-settings: 'dcaegen2-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
new file mode 100644
index 0000000..833cf69
--- /dev/null
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: dmaap-datarouter
+ project-name: 'dmaap-datarouter'
+ jobs:
+ - gerrit-maven-clm
+ project: 'dmaap/datarouter'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dmaap-datarouter-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/doc/doc-tools.yaml b/jjb/doc/doc-tools.yaml
new file mode 100644
index 0000000..f3112cd
--- /dev/null
+++ b/jjb/doc/doc-tools.yaml
@@ -0,0 +1,11 @@
+---
+- project:
+ name: doc-tools
+ project-name: 'doc-tools'
+ jobs:
+ - gerrit-maven-clm
+ project: 'doc/tools'
+ mvn-settings: 'doc-tools-settings'
+ stream:
+ - master:
+ branch: 'master'
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index adba3e9..21111d0 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -2,8 +2,8 @@
- project:
name: doc
project-name: 'doc'
-
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-rtd':
build-node: centos7-basebuild-4c-4g
- '{project-name}-{stream}-merge-rtd'
@@ -12,7 +12,7 @@
rtdproject: 'onap'
-
+ mvn-settings: 'doc-settings'
stream:
- master:
branch: 'master'
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index 73ebcd2..82eae48 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -49,8 +49,8 @@
settings-file: '{mvn-settings}'
- shell: |
#!/bin/bash
- curl -O https://dl.google.com/go/go1.9.4.linux-amd64.tar.gz
- tar -zxf go1.9.4.linux-amd64.tar.gz
+ curl -O https://dl.google.com/go/go1.10.linux-amd64.tar.gz
+ tar -zxf go1.10.linux-amd64.tar.gz
export GOROOT=$WORKSPACE/go
export PATH=$PATH:$GOROOT/bin
cd $WORKSPACE/{path}
diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml
new file mode 100644
index 0000000..f164a12
--- /dev/null
+++ b/jjb/integration/integration-seccom.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: integration-seccom
+ project-name: 'integration-seccom'
+ jobs:
+ - gerrit-maven-clm
+ project: 'integration/seccom'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'integration-seccom-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 816c006..ff8dea2 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -3,6 +3,7 @@
name: integration
project-name: 'integration'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 589f327..8398a9d 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -14,6 +14,7 @@
pom: 'multivimbroker/pom.xml'
pattern: 'multivimbroker/**'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -36,4 +37,4 @@
branch: 'master'
mvn-settings: 'multicloud-framework-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 88d2b92..d35cb4b 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -14,6 +14,7 @@
pom: 'vio/pom.xml'
pattern: 'vio/**'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -36,4 +37,4 @@
branch: 'master'
mvn-settings: 'multicloud-openstack-vmware-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 55bd88a..fdb3011 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -27,6 +27,7 @@
pattern: 'windriver/**'
pom: 'windriver/pom.xml'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
@@ -50,4 +51,4 @@
branch: 'master'
mvn-settings: 'multicloud-openstack-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index e6518b9..472be89 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -4,6 +4,7 @@
project-name: 'music-distributed-kv-store'
path: 'src/dkv'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-golang'
- '{project-name}-{stream}-merge-golang'
project: 'music/distributed-kv-store'
diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml
index be79462..65fda16 100644
--- a/jjb/oom/oom-oneclick-config.yaml
+++ b/jjb/oom/oom-oneclick-config.yaml
@@ -11,11 +11,12 @@
submodule-recursive: true
jobs:
+ - gerrit-maven-clm
- '{project}-{stream}-release-config'
stream:
- 'master':
branch: 'master'
-
+ mvn-settings: 'oom-settings'
- job-template:
name: '{project}-{stream}-release-config'
project-type: freestyle
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index c9c9ba8..8a39dd4 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -3,7 +3,7 @@
name: oom-registrator
project-name: 'oom-registrator'
jobs:
- - gerrit-maven-clm:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -31,4 +31,4 @@
branch: 'master'
mvn-settings: 'oom-registrator-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index 7cb8b7c..4ca31ed 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -7,6 +7,7 @@
pom: 'oparent-odlparent/pom.xml'
pattern: 'oparent-odlparent/**'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version3-java-daily'
diff --git a/jjb/optf/build-optf-has-docker-image.sh b/jjb/optf/build-optf-has-docker-image.sh
new file mode 100644
index 0000000..d1405f4
--- /dev/null
+++ b/jjb/optf/build-optf-has-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./conductor/docker/*.*
+
+./conductor/docker/build-dockers.sh
diff --git a/jjb/optf/build-optf-osdf-docker-image.sh b/jjb/optf/build-optf-osdf-docker-image.sh
new file mode 100644
index 0000000..99eab5d
--- /dev/null
+++ b/jjb/optf/build-optf-osdf-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./docker/*.*
+
+./docker/build_image.sh
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 77a7443..95eba8f 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -13,10 +13,16 @@
pattern: 'conductor/**'
pom: 'pom.xml'
jobs:
+ - gerrit-maven-clm
- '{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'
+ - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-optf-has-docker-image.sh'
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index e9571b7..d58611c 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -13,10 +13,16 @@
pattern: '**'
pom: 'pom.xml'
jobs:
+ - gerrit-maven-clm
- '{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'
+ - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-optf-osdf-docker-image.sh'
files: '**'
archive-artifacts: ''
build-node: 'ubuntu1604-basebuild-4c-4g'
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index 0ee0c85..de1392c 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -3,6 +3,7 @@
name: policy-docker
project-name: 'policy-docker-policy'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-scm-mvn-script':
mvn-goals: 'clean install prepare-package'
script:
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index 0e9155e..bad7d54 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -3,12 +3,13 @@
name: portal-sdk
project-name: 'portal-sdk'
subproject:
- - 'ecomp-sdk':
+ - 'onap-sdk':
pom: 'ecomp-sdk/pom.xml'
pattern: 'ecomp-sdk/**'
- subproject-name: 'ecomp-sdk'
+ subproject-name: 'onap-sdk'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-java-daily'
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 6b59c52..069090c 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -4,6 +4,7 @@
name: sdc-sdc-docker-base
project-name: 'sdc-sdc-docker-base'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-sdc-merge-java':
docker-pom: 'pom.xml'
mvn-profile: 'default'
diff --git a/jjb/sdnc/sdnc-features.yaml b/jjb/sdnc/sdnc-features.yaml
new file mode 100644
index 0000000..04670fb
--- /dev/null
+++ b/jjb/sdnc/sdnc-features.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: sdnc-features
+ project-name: 'sdnc-features'
+ jobs:
+ - gerrit-maven-clm
+
+ project: 'sdnc/features'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'sdnc-features-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/so/so-chef-repo.yaml b/jjb/so/so-chef-repo.yaml
new file mode 100644
index 0000000..08acb54
--- /dev/null
+++ b/jjb/so/so-chef-repo.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: so-chef-repo
+ project-name: 'so-chef-repo'
+ jobs:
+ - gerrit-maven-clm
+ project: 'so/chef-repo'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-chef-repo-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/so/so-docker-config.yaml b/jjb/so/so-docker-config.yaml
new file mode 100644
index 0000000..0d61fc4
--- /dev/null
+++ b/jjb/so/so-docker-config.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: so-docker-config
+ project-name: 'so-docker-config'
+ jobs:
+ - gerrit-maven-clm
+ project: 'so/docker-config'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-docker-config-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/so/so-so-config.yaml b/jjb/so/so-so-config.yaml
new file mode 100644
index 0000000..bf63719
--- /dev/null
+++ b/jjb/so/so-so-config.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: so-so-config
+ project-name: 'so-so-config'
+ jobs:
+ - gerrit-maven-clm
+ project: 'so/so-config'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-so-config-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 43757fa..d197c91 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -4,6 +4,7 @@
name: so
project-name: 'so'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-profile-java':
mvn-profile: 'with-integration-tests'
build-node: 'ubuntu1604-docker-8c-8g'
@@ -42,4 +43,4 @@
branch: 'master'
mvn-settings: 'so-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge-master.yaml
index 576cfe6..1e207d2 100644
--- a/jjb/testsuite/testsuite-heatbridge-master.yaml
+++ b/jjb/testsuite/testsuite-heatbridge-master.yaml
@@ -7,6 +7,7 @@
path: '.'
pattern: '**'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
project: 'testsuite/heatbridge'
@@ -18,4 +19,4 @@
mvn-settings: 'testsuite-heatbridge-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/testsuite/testsuite-properties.yaml b/jjb/testsuite/testsuite-properties.yaml
new file mode 100644
index 0000000..a4b8608
--- /dev/null
+++ b/jjb/testsuite/testsuite-properties.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: testsuite-properties-master
+ project-name: 'testsuite-properties'
+ jobs:
+ - gerrit-maven-clm
+ project: 'testsuite/properties'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'testsuite-properties-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index 01fca0d..9682c63 100644
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -7,6 +7,7 @@
path: '.'
pattern: '**'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
project: 'testsuite/python-testing-utils'
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 0ff88fe..ed89bee 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -3,6 +3,7 @@
name: testsuite
project-name: 'testsuite'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-3scm-docker-shell-daily':
script:
!include-raw-escape: 'testsuite-docker.sh'
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index def57d6..9107da3 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -11,6 +11,7 @@
branch: 'amsterdam'
mvn-settings: 'usecase-ui-server-settings'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -31,4 +32,4 @@
branch: 'master'
mvn-settings: 'usecase-ui-server-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 6d69829..51a1ebb 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -11,6 +11,7 @@
branch: 'amsterdam'
mvn-settings: 'usecase-ui-settings'
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index f480dcf..dcfdc23 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -14,4 +14,5 @@
mvn-settings: 'vnfsdk-pkgtools-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
new file mode 100644
index 0000000..aef9f2d
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -0,0 +1,35 @@
+---
+- project:
+ name: vnfsdk-ves-agent
+ project-name: 'vnfsdk-ves-agent'
+ subproject:
+ - 'veslibrary':
+ pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+ pattern: 'veslibrary/**'
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+
+ project: 'vnfsdk/ves-agent'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vnfsdk-ves-agent-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: vnfsdk-ves-agent-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+ build-node: ubuntu1604-basebuild-4c-4g
+ project: 'vnfsdk/ves-agent'
+ project-name: 'vnfsdk-ves-agent'
+ branch: 'master'
+ mvn-settings: 'vnfsdk-ves-agent-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
index ab38f3d..9c61247 100644
--- a/jjb/vvp/vvp-cms.yaml
+++ b/jjb/vvp/vvp-cms.yaml
@@ -14,6 +14,7 @@
mvn-settings: 'vvp-cms-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'
diff --git a/jjb/vvp/vvp-devkit.yaml b/jjb/vvp/vvp-devkit.yaml
index 12898a5..5056faf 100644
--- a/jjb/vvp/vvp-devkit.yaml
+++ b/jjb/vvp/vvp-devkit.yaml
@@ -14,6 +14,7 @@
mvn-settings: 'vvp-devkit-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
docker-pom: 'pom.xml'
mvn-profile: 'default'
diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml
new file mode 100644
index 0000000..222a62b
--- /dev/null
+++ b/jjb/vvp/vvp-documentation.yaml
@@ -0,0 +1,12 @@
+---
+- project:
+ name: vvp-documentation
+ project-name: 'vvp-documentation'
+ project: 'vvp/documentation'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vvp-documentation-settings'
+ build-node: ubuntu1604-basebuild-4c-4g
+ jobs:
+ - gerrit-maven-clm
diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml
index a98685b..4fd7583 100644
--- a/jjb/vvp/vvp-engagementmgr.yaml
+++ b/jjb/vvp/vvp-engagementmgr.yaml
@@ -14,6 +14,7 @@
mvn-settings: 'vvp-engagementmgr-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'
diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml
index 8a307a9..e9840e9 100644
--- a/jjb/vvp/vvp-gitlab.yaml
+++ b/jjb/vvp/vvp-gitlab.yaml
@@ -14,6 +14,7 @@
mvn-settings: 'vvp-gitlab-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'
diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml
index a9697c7..a7f6763 100644
--- a/jjb/vvp/vvp-image-scanner.yaml
+++ b/jjb/vvp/vvp-image-scanner.yaml
@@ -14,6 +14,7 @@
mvn-settings: 'vvp-image-scanner-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'
diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml
index 856b489..a37e2b1 100644
--- a/jjb/vvp/vvp-portal.yaml
+++ b/jjb/vvp/vvp-portal.yaml
@@ -14,6 +14,7 @@
mvn-settings: 'vvp-portal-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'
diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml
index c137ffb..782eb5b 100644
--- a/jjb/vvp/vvp-postgresql.yaml
+++ b/jjb/vvp/vvp-postgresql.yaml
@@ -14,6 +14,7 @@
mvn-settings: 'vvp-postgresql-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index de5857b..52f2dbd 100644
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -14,6 +14,7 @@
mvn-settings: 'vvp-test-engine-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-docker-java-daily'
docker-pom: 'pom.xml'
diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index ccbad15..85993d2 100644
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -14,4 +14,5 @@
mvn-settings: 'vvp-validation-scripts-settings'
build-node: ubuntu1604-basebuild-4c-4g
jobs:
+ - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'