From: mrichomme <morgan.richomme@orange.com>
Date: Tue, 28 Apr 2020 06:49:45 +0000 (+0200)
Subject: Use another docker jjb to build java11 in ONAP
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F106725%2F8;p=ci-management.git

Use another docker jjb to build java11 in ONAP

No need to use the maven based jjb

Issue-ID: INT-1555

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I5f9f67516e64342ad1431dc8c4cc04d40fd6b273
Signed-off-by: mrichomme <morgan.richomme@orange.com>
---

diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
index 512acc122..4ad47ab95 100644
--- a/jjb/integration/docker/integration-docker-onap-java11.yaml
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -48,23 +48,16 @@
 - project:
     name: 'integration-docker-onap-java11-docker'
     jobs:
-      - '{project-name}-{stream}-verify-docker'
-      - '{project-name}-{stream}-merge-docker'
-      - gerrit-maven-docker-stage:
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
+      - gerrit-docker-verify
+      - gerrit-docker-merge
     project-name: 'integration-docker-onap-java11'
     project: 'integration/docker/onap-java11'
     stream:
       - 'master':
-          branch: 'master'
-          mvn-params: '-P spring-boot-2-1'
-    docker_name: 'onap/integration-java11'
-    docker_build_args: '-f ./Dockerfile'
-    docker_root: '$WORKSPACE'
+            branch: 'master'
+            files: ''
+    docker-name: 'onap/integration-java11'
+    docker-build-args: '-f ./Dockerfile'
+    docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
-    mvn-version: 'mvn35'
-    files: '**'
     build-node: ubuntu1804-docker-8c-8g