Merge "Update global-jjb to v0.39.1"

[ci-management.git] / jjb / validation / validation-docker.yaml

diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml
index e7a5b63..dbcba48 100644 (file)
--- a/jjb/validation/validation-docker.yaml
+++ b/jjb/validation/validation-docker.yaml
@@ -37,6 +37,7 @@
     project-type: multijob
     disabled: '{obj:disabled}'
     node: 'centos7-builder-2c-1g'
+    build-timeout: 90
 
     parameters:
       - validation-job-parameters:
@@ -61,6 +62,7 @@
           branch: '{branch}'
           submodule-recursive: false
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
           choosing-strategy: default
 
     triggers:
@@ -92,6 +94,7 @@
     name: 'validation-docker-build-{arch_tag}-{stream}'
     disabled: '{obj:disabled}'
     node: '{slave_label}'
+    build-timeout: 75
 
     parameters:
       - validation-job-parameters:
@@ -114,6 +117,7 @@
           branch: '{branch}'
           submodule-recursive: false
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
           choosing-strategy: default
 
     builders:
@@ -122,11 +126,12 @@
           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:
@@ -144,6 +149,7 @@
           branch: '{branch}'
           submodule-recursive: false
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: false
           choosing-strategy: default
 
     builders:
@@ -152,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: