From: Bengt Thuree <bthuree@linuxfoundation.org>
Date: Wed, 9 Jun 2021 12:09:50 +0000 (+0000)
Subject: Merge "add merge job"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=2d9d654a2124625d02676694c4ffa3ed2f581ca4;hp=ca02d1aa61fc1019d0a45e53720294c72e18c32f;p=ci-management.git

Merge "add merge job"
---

diff --git a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
index c0bec43b..6858e5d8 100644
--- a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@ -19,7 +19,7 @@
    project-name: oam-nf-oam-adopter
    java-version: openjdk11
    mvn-pom: 'ves-nf-oam-adopter/pom.xml'
-   mvn-params: '-f 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'
@@ -38,11 +38,9 @@
     jobs:
       - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge:
-          mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker'
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-2c-8g
           maven-versions-plugin: true
-          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':
diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index 631fad6b..26299a12 100644
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -41,6 +41,8 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'webapp-frontend/.*'
+      - compare-type: REG_EXP
+        pattern: 'docker-compose/.*'
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -96,6 +98,8 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'nonrtric-gateway/.*'
+      - compare-type: REG_EXP
+        pattern: 'docker-compose/.*'
     build-node: ubuntu1804-docker-4c-4g
     jobs:
       - gerrit-maven-docker-verify