Add job to build java 17 docker

Update java 11 jobs to consider also java 17 build

Issue-ID: INT-2214
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>
Change-Id: Iaa475bc80de41da63376bae8ee71ec37bc55c159
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>

diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
index 4ad47ab..5074a0c 100644 (file)
--- a/jjb/integration/docker/integration-docker-onap-java11.yaml
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: integration-docker-onap-java11-info
-    project-name: integration-docker-onap-java11
+    name: integration-docker-onap-java-info
+    project-name: integration-docker-onap-java
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
@@ -9,9 +9,9 @@
     branch: master
 
 - project:
-      name: integration-docker-onap-java11-linters
+      name: integration-docker-onap-java-linters
       project: integration/docker/onap-java11
-      project-name: integration-docker-onap-java11
+      project-name: integration-docker-onap-java
       python-version: python3
       jobs:
           - integration-linters
@@ -37,8 +37,8 @@
                 branch: 'master'
 
 - project:
-    name: integration-docker-onap-java11-release
-    project-name: 'integration-docker-onap-java11'
+    name: integration-docker-onap-java-release
+    project-name: 'integration-docker-onap-java'
     project: 'integration/docker/onap-java11'
     mvn-settings: 'integration-settings'
     jobs:
@@ -46,18 +46,27 @@
           build-node: centos7-docker-8c-8g
 
 - project:
-    name: 'integration-docker-onap-java11-docker'
+    name: 'integration-docker-onap-java-docker'
     jobs:
-      - gerrit-docker-verify
-      - gerrit-docker-merge
-    project-name: 'integration-docker-onap-java11'
+      - gerrit-docker-verify:
+          project-name: 'integration-docker-onap-java11'
+          docker-name: 'onap/integration-java11'
+      - gerrit-docker-merge:
+          project-name: 'integration-docker-onap-java11'
+          docker-name: 'onap/integration-java11'
+      - gerrit-docker-verify:
+          project-name: 'integration-docker-onap-java17'
+          docker-name: 'onap/integration-java17'
+          docker-build-args: '--build-arg java_ver=onap-java17'
+      - gerrit-docker-merge:
+          project-name: 'integration-docker-onap-java17'
+          docker-name: 'onap/integration-java17'
+          docker-build-args: '--build-arg java_ver=onap-java17'
     project: 'integration/docker/onap-java11'
     stream:
       - 'master':
             branch: 'master'
             files: ''
-    docker-name: 'onap/integration-java11'
-    docker-build-args: '-f ./Dockerfile'
     docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
     build-node: ubuntu1804-docker-8c-8g