Merge "Migrate to gerrit-maven-stage (DMAAP)"

diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index 1d38ead..ba37d57 100644 (file)
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -48,8 +48,10 @@
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
+      **/cov-int/BUILD.metrics.xml
       **/cov-int/build-log.txt
       **/cov-int/build-timings.txt
+      **/cov-int/java-security-da-whitelist.dat
 
     properties:
       - lf-infra-properties:

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 714878e..401eecf 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -5,44 +5,6 @@
     views:
       - project-view
 
-- project:
-    name: integration
-    project-name: 'integration'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-          mvn-pom: 'version-manifest/pom.xml'
-          mvn-params: '-f version-manifest/pom.xml'
-    project: 'integration'
-    subproject:
-      - 'version-manifest':
-          pom: 'version-manifest/pom.xml'
-          pattern: 'version-manifest/**'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: integration-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f version-manifest/pom.xml'
-    nexus-iq-namespace: 'onap-'
-    project: integration
-    project-name: 'integration'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-settings'
-
 - project:
     name: integration-info
     project-name: integration

diff --git a/jjb/multicloud/kud-deployment.sh b/jjb/multicloud/kud-deployment.sh
index 937e6c3..a5cc39e 100644 (file)
--- a/jjb/multicloud/kud-deployment.sh
+++ b/jjb/multicloud/kud-deployment.sh
@@ -1,8 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-# setting-up bash flags
 set -x -e -o pipefail
-
-# run all-in-one deployment
 cd ./kud/ci
-sudo bash -x ./kud-installer.sh
+bash -x ./kud-installer.sh

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index e49aed8..ab7b8aa 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -15,7 +15,7 @@
          disabled: true
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 3391fac..3a75eca 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -21,8 +21,6 @@
           mvn-params: '-P docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-{stream}-release-version-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
     project: 'vid'
     stream:
       - 'master':
@@ -34,24 +32,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: vid-docker
-    project-name: 'vid'
-    jobs:
-      - 'docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-    project: 'vid'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'vid-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: queue-docker-4c-4g
-
 #- project:
 #    name: vid-docker-arm64
 #    project-name: 'vid-arm64'

diff --git a/shell/maven-coverity.sh b/shell/maven-coverity.sh
index e319b06..17601d4 100644 (file)
--- a/shell/maven-coverity.sh
+++ b/shell/maven-coverity.sh
@@ -109,6 +109,16 @@ cov-import-scm \
   --dir 'cov-int' \
   --scm 'git'
 
+cov-manage-emit \
+  --dir cov-int \
+  list \
+| grep \
+  --invert-match \
+  '^Translation unit:$' \
+| sed \
+  's!^[[:digit:]]\+ -> !!' \
+> 'coverity-scan-analysed-files.log'
+
 #-----------------------------------------------------------------------------
 # Submit results to Coverity service