X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates-docker.yaml;h=a0fafde4e1abb29e4a55793e00d9f121fc6b7f12;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=c8041a2a807a4ae3874a53a03b731e6288b2a88b;hpb=329e0a0a1058399a5882d26d5e8eb101f070cbcc;p=ci-management.git

diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index c8041a2a8..a0fafde4e 100644
--- 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: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
+    mvn-goals: 'clean package docker:build docker:push'
 
     properties:
       - infra-properties:
@@ -31,8 +33,6 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      # 12 AM UTC
-      - timed: 'H 12 * * *'
       - gerrit-trigger-patch-merged:
           server: '{server-name}'
           project: '{project}'
@@ -40,7 +40,6 @@
           files: '{pattern}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -50,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'
@@ -60,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: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     docker-image-name: ''
+    mvn-goals: 'clean package docker:build'
+    post-docker-verify-script: ''
 
     properties:
       - infra-properties:
@@ -86,8 +87,8 @@
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
@@ -102,7 +103,6 @@
           files: '{pattern}'
 
     builders:
-
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -112,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'
@@ -120,8 +120,56 @@
           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'
+    docker_root: '$WORKSPACE'
+    post_script: ''
+    netconf_sim_service_name: ''
 
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{pattern}'
+
+    builders:
+      - inject:
+          properties-content: |
+            DOCKER_ROOT={docker_root}
+            NETCONF_SIM_SERVICE_NAME={netconf_sim_service_name}
+      - shell: '{script}'
+      - shell: '{post_script}'
+
+    publishers:
+      - integration-docker-compose-logs
+      - lf-infra-publish