Merge "Changing related settings file"

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/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 51fec37..6fdabeb 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -12,7 +12,8 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          build-node: ubuntu1604-builder-4c-4g
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g

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/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 418f0f2..2de26d0 100644 (file)
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -34,6 +34,7 @@
         - 'dublin':
               branch: 'dublin'
     mvn-settings: 'clamp-settings'
+    java-version: openjdk13
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
@@ -51,6 +52,7 @@
     mvn-settings: 'clamp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk13
 
 - project:
     name: clamp-clm
@@ -64,6 +66,7 @@
     mvn-settings: 'clamp-settings'
     build-node: ubuntu1604-docker-8c-8g
     build-timeout: 120
+    java-version: openjdk13
 
 - project:
     name: clamp-info

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/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 31c5221..0a2ffe5 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -7,7 +7,8 @@
           build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true"
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          sign-aftifacts: true
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
 
     project: 'dcaegen2/services/sdk'
@@ -19,7 +20,7 @@
     mvn-settings: 'dcaegen2-services-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'centos7-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -28,7 +29,7 @@
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: centos7-docker-8c-8g
     project: 'dcaegen2/services/sdk'
     project-name: 'dcaegen2-services-sdk'
     branch: 'master'
@@ -42,7 +43,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services/sdk
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: centos7-docker-8c-8g
     project-name: 'dcaegen2-services-sdk'
     branch: 'master'
     mvn-settings: 'dcaegen2-services-sdk-settings'

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 3579ab3..50d64f6 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -22,6 +22,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
@@ -37,6 +38,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    recipients: 'ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
@@ -67,6 +69,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    recipients: 'ah999m@att.com'
     stream:
       - 'master':
           branch: master
@@ -82,6 +85,7 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    recipients: 'jrh3@att.com ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
@@ -120,4 +124,3 @@
     trigger_jobs:
       - 'policy-drools-applications-{stream}-merge-java'
     robot-options: ''
-

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

diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml
new file mode 100644 (file)
index 0000000..5d2be71
--- /dev/null
+++ b/jjb/sdnc/sdnc-oom.yaml
@@ -0,0 +1,42 @@
+---
+- project:
+    name: sdnc-oom
+    helm-module: 'sdnc'
+    project-name: 'sdnc-oom'
+    project: 'sdnc/oom'
+    jobs:
+      - '{project-name}-{stream}-verify-external-helm'
+      - '{project-name}-{stream}-merge-external-helm':
+          build_script: '{oom_build_script}'
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+          files: '**'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
+
+    mvn-settings: 'sdnc-oom-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-helm-2c-1g
+    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
+    oom_build_script: |
+        #!/bin/bash
+        set -e -o pipefail
+        cd kubernetes/
+        make all
+    build_script: |
+        #!/bin/bash
+        cd kubernetes/
+        make common
+        make {helm-module}
+    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+
+- project:
+    name: sdnc-oom-info
+    project-name: sdnc-oom
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sdnc/oom
+    branch: master