Chore: Move to centos8-builder

[ci-management.git] / jjb / integration / docker / integration-docker-onap-java11.yaml

diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
index 512acc1..f290699 100644 (file)
--- a/jjb/integration/docker/integration-docker-onap-java11.yaml
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -1,17 +1,17 @@
 ---
 - 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
+    build-node: centos8-builder-2c-1g
     project: integration/docker/onap-java11
     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,25 +46,27 @@
           build-node: centos7-docker-8c-8g
 
 - project:
-    name: 'integration-docker-onap-java11-docker'
+    name: 'integration-docker-onap-java-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'
-    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'
-          mvn-params: '-P spring-boot-2-1'
-    docker_name: 'onap/integration-java11'
-    docker_build_args: '-f ./Dockerfile'
-    docker_root: '$WORKSPACE'
+            branch: 'master'
+            files: ''
+    docker-root: '$WORKSPACE'
     mvn-settings: 'integration-settings'
-    mvn-version: 'mvn35'
-    files: '**'
     build-node: ubuntu1804-docker-8c-8g