Merge "Extend CI job for ves client"

diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index a0c5cef..bf094b5 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -4,12 +4,15 @@
       project-name: 'integration-simulators-nf-simulator-avcn-manager'
       java-version: openjdk11
       jobs:
-          - '{project-name}-{stream}-verify-java'
-          - '{project-name}-{stream}-merge-java'
+          - '{project-name}-{stream}-verify-java':
+                mvn-goals: 'clean install -P docker -DskipDockerPush=true'
+          - '{project-name}-{stream}-merge-java':
+                mvn-goals: 'clean deploy'
           - gerrit-maven-stage:
                 sign-artifacts: true
                 build-node: centos7-docker-8c-8g
                 maven-versions-plugin: true
+                mvn-goals: 'clean deploy'
           - gerrit-maven-docker-stage:
                 build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 8be62de..6fae06b 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -32,8 +32,8 @@
       - 'guilin':
           branch: 'guilin'
           java-version: openjdk11
-      - 'dynamicBPMN':
-          branch: 'Dynamic_BPMN'
+      - 'honolulu':
+          branch: 'honolulu'
           java-version: openjdk11
     mvn-settings: 'so-settings'
     files: '**'
@@ -113,3 +113,4 @@
     project: so
     branch: master
     branch: guilin
+    branch: honolulu