summaryrefslogtreecommitdiffstats
path: root/jjb/dcaegen2
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/dcaegen2')
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics-flink.yaml8
-rw-r--r--jjb/dcaegen2/dcaegen2-analytics.yaml8
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors-ves.yaml1
-rw-r--r--jjb/dcaegen2/dcaegen2-collectors.yaml8
-rw-r--r--jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml6
-rw-r--r--jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml (renamed from jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-java.yaml)90
-rw-r--r--jjb/dcaegen2/dcaegen2-services-sdk.yaml13
7 files changed, 80 insertions, 54 deletions
diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
new file mode 100644
index 000000000..c98abc9ee
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+ name: dcaegen2-analytics-flink-info
+ project-name: dcaegen2-analytics-flink
+ jobs:
+ - gerrit-info-yaml-verify
+ project: dcaegen2/analytics/flink
+ branch: master
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
new file mode 100644
index 000000000..452bd56fe
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-analytics.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+ name: dcaegen2-analytics-info
+ project-name: dcaegen2-analytics
+ jobs:
+ - gerrit-info-yaml-verify
+ project: dcaegen2/analytics
+ branch: master
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 4f51f2bf7..fc12da490 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -2,6 +2,7 @@
- project:
name: dcaegen2-collectors-ves
project-name: 'dcaegen2-collectors-ves'
+ java-version: openjdk11
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
new file mode 100644
index 000000000..35e25921a
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+ name: dcaegen2-collectors-info
+ project-name: dcaegen2-collectors
+ jobs:
+ - gerrit-info-yaml-verify
+ project: dcaegen2/collectors
+ branch: master
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
index 955b1f774..3eb59891b 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
@@ -1,16 +1,14 @@
- project:
name: dcaegen2-services-pmsh-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
- project-name: 'dcaegen2-services-pmsh'
+ project-name: dcaegen2-services-pmsh
recipients: 'lego@est.tech'
- disabled: true
stream:
- 'master':
branch: 'master'
functionality:
- 'testsuites':
trigger_jobs:
- - '{project-name}-{stream}-pmsh-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
robot-options: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-java.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
index fed43a65f..7839270ee 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml
@@ -1,29 +1,8 @@
---
- project:
- name: dcaegen2-services-pmsh
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- subproject:
- - 'pmsh':
- pom: 'components/pm-subscription-handler/pom.xml'
- pattern: 'components/pm-subscription-handler/**'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
-
-- project:
name: dcaegen2-services-pmsh-release
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-pmsh'
+ project: dcaegen2/services
+ project-name: dcaegen2-services-pmsh-release
jobs:
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
@@ -38,36 +17,59 @@
build-node: centos7-docker-8c-8g
stream:
- 'master':
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
+ branch: master
+ mvn-settings: dcaegen2-services-settings
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-docker-8c-8g
+
+- project:
+ name: dcaegen2-services-pmsh
+ project: dcaegen2/services
+ project-name: dcaegen2-services
+ tox-dir: components/pm-subscription-handler/
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: 'components/pm-subscription-handler/**'
+ subproject:
+ - 'pmsh':
+ pom: 'components/pm-subscription-handler/pom.xml'
+ pattern: 'components/pm-subscription-handler/**'
+ mvn-settings: dcaegen2-services-settings
maven-deploy-properties: |
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: ubuntu1604-docker-8c-8g
+ # used by tox-install.sh to specify the interpreter used to install tox
+ python-version: python3
+ jobs:
+ # clm and tox
+ - '{project-name}-python-jobs'
+ # build docker image
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ stream:
+ - master:
+ branch: master
- project:
name: dcaegen2-services-pmsh-sonar
+ python-version: python3
+ tox-dir: components/pm-subscription-handler/
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: 'components/pm-subscription-handler/**'
jobs:
- - gerrit-maven-sonar
+ - gerrit-tox-sonar
cron: '@daily'
- build-node: 'ubuntu1604-builder-4c-4g'
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-pmsh'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
+ build-node: ubuntu1604-builder-4c-4g
+ project: dcaegen2/services
+ project-name: dcaegen2-services-pmsh
+ branch: master
+ mvn-settings: dcaegen2-services-settings
mvn-params: '-f components/pm-subscription-handler/pom.xml'
- mvn-goals: 'clean install'
+ mvn-goals: 'clean test'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-- project:
- name: dcaegen2-services-pmsh-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- build-node: 'ubuntu1604-docker-8c-8g'
- project: 'dcaegen2/services'
- project-name: 'dcaegen2-services-pmsh'
- mvn-params: '-f components/pm-subscription-handler/pom.xml'
- branch: 'master'
- mvn-settings: 'dcaegen2-services-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 0da5dd2b1..5d3e2e28e 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -3,13 +3,14 @@
name: dcaegen2-services-sdk
project-name: 'dcaegen2-services-sdk'
jobs:
- - '{project-name}-{stream}-verify-java':
- build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
+ - '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- gerrit-maven-stage:
- sign-aftifacts: true
+ sign-artifacts: true
build-node: centos7-docker-8c-8g
maven-versions-plugin: true
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
project: 'dcaegen2/services/sdk'
stream:
@@ -27,7 +28,8 @@
- project:
name: dcaegen2-services-sdk-integration-pairwise
jobs:
- - '{project-name}-{stream}-integration-pairwise'
+ - '{project-name}-{stream}-integration-pairwise':
+ build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
build-node: ubuntu1604-docker-8c-8g
project: 'dcaegen2/services/sdk'
project-name: 'dcaegen2-services-sdk'
@@ -35,8 +37,7 @@
- 'master':
branch: 'master'
mvn-settings: 'dcaegen2-services-sdk-settings'
- mvn-goals: 'clean install'
- mvn-opts: ' -P integration-pairwise'
+ mvn-params: ' -P integration-pairwise'
- project:
name: dcaegen2-services-sdk-sonar