Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add new job for deploying libvirt"
[ci-management.git]
/
jjb
/
validation
/
validation-docker.yaml
diff --git
a/jjb/validation/validation-docker.yaml
b/jjb/validation/validation-docker.yaml
index
17f67d3
..
ae3d0d4
100644
(file)
--- 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}'
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}'
parameters:
- validation-job-parameters:
project: '{project}'
branch: '{branch}'
stream: '{stream}'
- slave_label: 'ubuntu1604-docker-8c-8g'
- arch_tag: 'amd64'
properties:
- throttle:
properties:
- throttle:
@@
-92,13
+92,16
@@
- job-template:
name: 'validation-docker-build-{arch_tag}-{stream}'
disabled: '{obj:disabled}'
- 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}'
parameters:
- validation-job-parameters:
project: '{project}'
branch: '{branch}'
stream: '{stream}'
- slave_label: '{slave_label}'
arch_tag: '{arch_tag}'
arch_tag: '{arch_tag}'
+
properties:
- build-blocker:
use-build-blocker: true
properties:
- build-blocker:
use-build-blocker: true
@@
-125,13
+128,14
@@
- job-template:
name: 'validation-docker-manifest-{stream}'
- 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}'
parameters:
- validation-job-parameters:
project: '{project}'
branch: '{branch}'
stream: '{stream}'
- slave_label: 'ubuntu1604-docker-8c-8g'
disabled: '{obj:disabled}'
disabled: '{obj:disabled}'
@@
-151,7
+155,7
@@
settings-file: '{mvn-settings}'
- shell: |
#!/bin/bash -ex
settings-file: '{mvn-settings}'
- shell: |
#!/bin/bash -ex
- make -C docker/*/. .push_manifest
+ for sd in docker/*/.; do make -C $sd .push_manifest; done
# parameter macro
- parameter:
# parameter macro
- parameter:
@@
-161,9
+165,3
@@
project: '{project}'
stream: '{stream}'
branch: '{branch}'
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'