Chore: Move to ubuntu2004-docker

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

diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index e434d0a..6a1aa3b 100644 (file)
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -1,9 +1,11 @@
 ---
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-merge'
+    id: integration-docker-merge
     project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
+    node: 'ubuntu2004-docker-8c-8g'
     docker-image-name: ''
+    mvn-goals: 'clean package docker:build docker:push'
 
     properties:
       - infra-properties:
@@ -38,7 +40,6 @@
           files: '{pattern}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -48,7 +49,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean package docker:build docker:push'
+          goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -58,14 +59,16 @@
             - docker.push.registry=nexus3.onap.org:10003
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-verify'
+    id: integration-docker-verify
     project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
+    node: 'ubuntu2004-docker-8c-8g'
     docker-image-name: ''
+    mvn-goals: 'clean package docker:build'
+    post-docker-verify-script: ''
 
     properties:
       - infra-properties:
@@ -100,7 +103,6 @@
           files: '{pattern}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -110,7 +112,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean package docker:build'
+          goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -118,18 +120,17 @@
           properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
+      - shell: '{post-docker-verify-script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
     id: integration-docker-compose-verify
     project-type: freestyle
     description: 'This job validates Docker Compose based projects'
-    node: 'ubuntu1804-docker-8c-8g'
+    node: 'ubuntu2004-docker-8c-8g'
     docker_root: '$WORKSPACE'
     post_script: ''
     netconf_sim_service_name: ''