Merge "Add mail address for notification of csit policy tests"

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
index 225e5c4..29067e8 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190925-220639.261
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20191106-004821.547
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index c833d79..d2c0c4b 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -15,8 +15,6 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily':
-          build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
new file mode 100644 (file)
index 0000000..52fecda
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-csit.yaml
@@ -0,0 +1,16 @@
+- project:
+    name: dcaegen2-pm-subscription-handler-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'dcaegen2-services-pmsh'
+    recipients: 'lego@est.tech'
+    disabled: true
+    stream:
+      - 'master':
+          branch: 'master'
+    functionality:
+      - 'pmsh-testsuites':
+          trigger_jobs:
+            - '{project-name}-{stream}-pmsh-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-java.yaml
new file mode 100644 (file)
index 0000000..73a035e
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler-java.yaml
@@ -0,0 +1,73 @@
+---
+- 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-pmsh-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'
+    jobs:
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          version-properties-file: 'components/pm-subscription-handler/version.properties'
+          mvn-pom: 'components/pm-subscription-handler/pom.xml'
+          mvn-goals: 'clean deploy -f components/pm-subscription-handler/pom.xml'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          pattern: 'components/pm-subscription-handler/**'
+      - '{project-name}-gerrit-release-jobs':
+              build-node: centos7-docker-8c-8g
+    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-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: '@daily'
+    build-node: 'ubuntu1604-builder-4c-4g'
+    project: 'dcaegen2/services'
+    project-name: 'dcaegen2-services-pmsh'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-services-pmsh-settings'
+    mvn-params: '-f components/pm-subscription-handler/pom.xml'
+    mvn-goals: 'clean install'
+    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-pmsh-settings'

diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index cb9130f..0a1f19a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: centos7-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build docker:push'

diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
deleted file mode 100644 (file)
index 806b1cc..0000000
--- a/jjb/sdc/sdc-jtosca.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- project:
-    name: sdc-jtosca-project-view
-    project-name: sdc-jtosca
-    views:
-      - project-view
-
-- project:
-    name: sdc-jtosca
-    project-name: 'sdc-jtosca'
-    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: 'sdc/jtosca'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-jtosca-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-    maven-version: 'mvn35'
-
-- project:
-    name: sdc-jtosca-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'sdc/jtosca'
-    project-name: 'sdc-jtosca'
-    branch: 'master'
-    mvn-settings: 'sdc-jtosca-settings'
-    mvn-params: '-Dsonar.branch={branch}'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m'
-
-- project:
-    name: sdc-jtosca-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/jtosca
-    project-name: 'sdc-jtosca'
-    branch: 'master'
-    mvn-settings: 'sdc-jtosca-settings'
-
-- project:
-    name: sdc-jtosca-info
-    project-name: sdc-jtosca
-    jobs:
-      - gerrit-info-yaml-verify
-    project: sdc/jtosca
-    branch: master

diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
deleted file mode 100644 (file)
index 68ebd00..0000000
--- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: sdc-sdc-titan-project-view
-    project-name: sdc-sdc-titan
-    views:
-      - project-view
-
-- project:
-    name: sdc-sdc-titan-cassandra
-    project-name: 'sdc-sdc-titan-cassandra'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-    project: 'sdc/sdc-titan-cassandra'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdc-sdc-titan-cassandra-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-timeout: 60
-    maven-version: 'mvn35'
-
-- project:
-    name: sdc-sdc-titan-cassandra-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdc/sdc-titan-cassandra
-    project-name: 'sdc-sdc-titan-cassandra'
-    branch: 'master'
-    mvn-settings: 'sdc-sdc-titan-cassandra-settings'
-
-- project:
-    name: sdc-sdc-titan-cassandra-info
-    project-name: sdc-sdc-titan-cassandra
-    jobs:
-      - gerrit-info-yaml-verify
-    project: sdc/sdc-titan-cassandra
-    branch: master