Merge "Update ubuntu builder and docker images"

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 62e7c93..158df9b 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -9,8 +9,9 @@
     name: aai-babel
     project-name: 'aai-babel'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -34,6 +35,8 @@
     build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
     mvn-version: 'mvn36'
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-babel-sonar

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index f4ca048..0d0274a 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -228,7 +228,14 @@
       - integration-run-project-test
       - lf-provide-maven-settings-cleanup
     publishers:
+      - integration-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
       - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
 
 - job-template:
     # Job template for unified review verification jobs in

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 96f6625..b943c9f 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -19,6 +19,10 @@
                     integration-tests/target/ExtentReport/API/*.html
                     integration-tests/target/ExtentReport/UI/*.html
                     integration-tests/target/ExtentReport/UI/screenshots/*.png
+                    /tmp/sdc-integration-tests/*.log*
+                    /tmp/sdc-integration-tests/SDC/ONBOARDING-BE/*.log
+                    /tmp/sdc-integration-tests/SDC/SDC-BE/*.log
+                    /tmp/sdc-integration-tests/SDC/SDC-FE/*.log
           - '{project-name}-merge-verification-maven-{stream}':
                 build-node: ubuntu1804-docker-8c-16g
                 container-public-registry: 'nexus3.onap.org:10001'