From: Claudio D. Gasparini <claudio.gasparini@intl.att.com>
Date: Tue, 11 May 2021 16:54:25 +0000 (+0200)
Subject: Fix oam-nf-oam-adopter-maven-merge job
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=6becea51da3232686d2419eda92f40053a31f290;p=ci-management.git

Fix oam-nf-oam-adopter-maven-merge job

mvn-params was being overrided loosing the
location of the root pom.xml

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

diff --git a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
index 6076dd08..4eb46545 100644
--- a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@ -38,7 +38,7 @@
     jobs:
       - gerrit-maven-verify
       - gerrit-maven-merge:
-          mvn-params: '-P docker'
+          mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-1c-1g
@@ -46,7 +46,7 @@
       - gerrit-maven-docker-stage:
           build-node: centos7-builder-1c-1g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker'
           container-public-registry: nexus3.o-ran-sc.org:10001
           container-staging-registry: nexus3.o-ran-sc.org:10004
       - '{project-name}-gerrit-release-jobs':
@@ -70,7 +70,7 @@
     branch: 'master'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-params: '-Ddocker.skip=true'
+    mvn-params: '-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true'
 
 - project:
     <<: *oam-nf-oam-adopter