X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fvalidation%2Fvalidation-docker.yaml;h=dbcba48e7b865664d673b5860861a9cb0dd3d4d2;hp=17f67d3cf143f29da9e0b059e7211627ff4e4572;hb=3f07b7f362fcac175e24d1761ed2bbc3120ec216;hpb=911c6f2e1e0da7ced131223a3a0fc28c10f041f4

diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml
index 17f67d3..dbcba48 100644
--- a/jjb/validation/validation-docker.yaml
+++ b/jjb/validation/validation-docker.yaml
@@ -36,14 +36,14 @@
     name: 'validation-{stream}-docker'
     project-type: multijob
     disabled: '{obj:disabled}'
+    node: 'centos7-builder-2c-1g'
+    build-timeout: 90
 
     parameters:
       - validation-job-parameters:
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          slave_label: 'ubuntu1604-docker-8c-8g'
-          arch_tag: 'amd64'
 
     properties:
       - throttle:
@@ -62,6 +62,7 @@
           branch: '{branch}'
           submodule-recursive: false
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
           choosing-strategy: default
 
     triggers:
@@ -92,13 +93,16 @@
 - job-template:
     name: 'validation-docker-build-{arch_tag}-{stream}'
     disabled: '{obj:disabled}'
+    node: '{slave_label}'
+    build-timeout: 75
+
     parameters:
       - validation-job-parameters:
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          slave_label: '{slave_label}'
           arch_tag: '{arch_tag}'
+
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -113,6 +117,7 @@
           branch: '{branch}'
           submodule-recursive: false
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
           choosing-strategy: default
 
     builders:
@@ -121,17 +126,18 @@
           settings-file: '{mvn-settings}'
       - shell: |
           #!/bin/bash -ex
-          make -C docker push-all
+          make -k -C docker push-all
 
 - job-template:
     name: 'validation-docker-manifest-{stream}'
+    node: 'ubuntu1604-docker-8c-8g'
+    build-timeout: 15
 
     parameters:
       - validation-job-parameters:
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
-          slave_label: 'ubuntu1604-docker-8c-8g'
 
     disabled: '{obj:disabled}'
 
@@ -143,6 +149,7 @@
           branch: '{branch}'
           submodule-recursive: false
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
           choosing-strategy: default
 
     builders:
@@ -151,7 +158,7 @@
           settings-file: '{mvn-settings}'
       - shell: |
           #!/bin/bash -ex
-          make -C docker/*/. .push_manifest
+          for sd in docker/*/.; do make -k -C $sd .push_manifest; done
 
 # parameter macro
 - parameter:
@@ -161,9 +168,3 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
-      - label:
-          name: SLAVE_LABEL
-          default: '{slave_label}'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'