From: Claudio D. Gasparini <claudio.gasparini@intl.att.com>
Date: Wed, 7 Jul 2021 07:44:23 +0000 (+0200)
Subject: Restore maven-verify / merge jobs
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9619acec6d0490371b9c1a1b6b8c6db85de9993a;p=ci-management.git

Restore maven-verify / merge jobs

Issue-ID: OAM-202
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@intl.att.com>
Change-Id: I3517a021245ddbb4ecb8b0ceabfc7fbf7a0b83a5
---

diff --git a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
index 9bc64192..e6154436 100644
--- a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@ -21,7 +21,6 @@
    mvn-pom: 'ves-nf-oam-adopter/pom.xml'
    mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker -Dbuild.number=${{BUILD_NUMBER}}'
    mvn-version: "mvn36"
-   maven-version: "mvn36"
    mvn-settings: 'oam-nf-oam-adopter-settings'
    build-node: centos7-docker-2c-8g
 
@@ -36,6 +35,8 @@
 - project:
     <<: *oam-nf-oam-adopter
     jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge
       - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge:
       - gerrit-maven-stage:
@@ -64,6 +65,7 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar.build.sourceEncoding: 'UTF-8'
     cron: '@daily'
     branch: 'master'
     mvn-goals: 'clean install'