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
[ta] Move image build job to a bigger build minion
[ci-management.git]
/
jjb
/
iec
/
iec.yaml
diff --git
a/jjb/iec/iec.yaml
b/jjb/iec/iec.yaml
index
faab545
..
c63f546
100644
(file)
--- a/
jjb/iec/iec.yaml
+++ b/
jjb/iec/iec.yaml
@@
-17,7
+17,7
@@
# -------------------------------
# DEPLOY TYPE DEFINITIONS
# -------------------------------
# -------------------------------
# DEPLOY TYPE DEFINITIONS
# -------------------------------
- deploy
-
type:
+ deploy
_
type:
- fuel-baremetal:
slave-label: 'aarch64_dev'
scenario: 'k8-calico-iec-noha'
- fuel-baremetal:
slave-label: 'aarch64_dev'
scenario: 'k8-calico-iec-noha'
@@
-37,9
+37,9
@@
scenario: 'k8-calico-iec-noha'
jobs:
scenario: 'k8-calico-iec-noha'
jobs:
- - 'iec-{deploy
-
type}-daily-{stream}'
- - 'iec-deploy-{deploy
-
type}-daily-{stream}'
- - 'iec-install-{usecase}-{deploy
-
type}-daily-{stream}'
+ - 'iec-{deploy
_
type}-daily-{stream}'
+ - 'iec-deploy-{deploy
_
type}-daily-{stream}'
+ - 'iec-install-{usecase}-{deploy
_
type}-daily-{stream}'
##############
# PARAMETERS #
##############
# PARAMETERS #
@@
-87,7
+87,7
@@
# job templates
########################
- job-template:
# job templates
########################
- job-template:
- name: 'iec-{deploy
-
type}-daily-{stream}'
+ name: 'iec-{deploy
_
type}-daily-{stream}'
disabled: '{obj:disabled}'
concurrent: false
node: '{slave-label}'
disabled: '{obj:disabled}'
concurrent: false
node: '{slave-label}'
@@
-100,7
+100,7
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '.*-{deploy
-
type}-daily-.*'
+ - '.*-{deploy
_
type}-daily-.*'
blocking-level: 'NODE'
wrappers:
blocking-level: 'NODE'
wrappers:
@@
-108,7
+108,7
@@
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
triggers:
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
triggers:
- - 'iec-{deploy
-
type}-daily-{stream}-trigger'
+ - 'iec-{deploy
_
type}-daily-{stream}-trigger'
parameters:
- lf-infra-parameters:
parameters:
- lf-infra-parameters:
@@
-122,19
+122,24
@@
builders:
- trigger-builds:
builders:
- trigger-builds:
- - project: 'iec-deploy-{deploy
-
type}-daily-{stream}'
+ - project: 'iec-deploy-{deploy
_
type}-daily-{stream}'
current-parameters: false
current-parameters: false
- predefined-parameters:
|
+ predefined-parameters:
DEPLOY_SCENARIO={scenario}
same-node: true
block: true
DEPLOY_SCENARIO={scenario}
same-node: true
block: true
- - project: 'iec-install-{usecase}-daily-{stream}'
+ - project:
+ !j2: |
+ {%- for uc in usecase -%}
+ iec-install-{{ uc | first }}-{{ deploy_type }}-daily-{{ stream }}
+ {%- if not loop.last -%},{%- endif -%}
+ {%- endfor %}
current-parameters: false
same-node: true
block: true
- job-template:
current-parameters: false
same-node: true
block: true
- job-template:
- name: 'iec-deploy-{deploy
-
type}-daily-{stream}'
+ name: 'iec-deploy-{deploy
_
type}-daily-{stream}'
concurrent: true
node: '{slave-label}'
properties:
concurrent: true
node: '{slave-label}'
properties:
@@
-146,7
+151,7
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '.*-deploy-{deploy
-
type}-daily-*'
+ - '.*-deploy-{deploy
_
type}-daily-*'
blocking-level: 'NODE'
parameters:
blocking-level: 'NODE'
parameters:
@@
-184,18
+189,20
@@
- conditional-step:
condition-kind: regex-match
regex: 'compass-.*'
- conditional-step:
condition-kind: regex-match
regex: 'compass-.*'
- label: '{deploy
-
type}'
+ label: '{deploy
_
type}'
steps:
- shell:
!include-raw-escape: ./iec-compass-build.sh
- shell:
!include-raw-escape: ./iec-compass-deploy.sh
steps:
- shell:
!include-raw-escape: ./iec-compass-build.sh
- shell:
!include-raw-escape: ./iec-compass-deploy.sh
+ - shell:
+ !include-raw-escape: ./iec-fdn-install.sh
- shell:
!include-raw-escape: ./iec-compass-destroy.sh
- conditional-step:
condition-kind: regex-match
regex: 'fuel-.*'
- shell:
!include-raw-escape: ./iec-compass-destroy.sh
- conditional-step:
condition-kind: regex-match
regex: 'fuel-.*'
- label: '{deploy
-
type}'
+ label: '{deploy
_
type}'
steps:
- shell:
!include-raw-escape: ./iec-fuel-deploy.sh
steps:
- shell:
!include-raw-escape: ./iec-fuel-deploy.sh
@@
-206,7
+213,7
@@
- lf-infra-publish
- job-template:
- lf-infra-publish
- job-template:
- name: 'iec-install-{usecase}-{deploy
-
type}-daily-{stream}'
+ name: 'iec-install-{usecase}-{deploy
_
type}-daily-{stream}'
concurrent: true
node: '{slave-label}'
properties:
concurrent: true
node: '{slave-label}'
properties:
@@
-218,8
+225,8
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '.*-deploy-{deploy
-
type}-daily-*'
- - '.*-install-{usecase}-{deploy
-
type}-daily-*'
+ - '.*-deploy-{deploy
_
type}-daily-*'
+ - '.*-install-{usecase}-{deploy
_
type}-daily-*'
blocking-level: 'NODE'
parameters:
blocking-level: 'NODE'
parameters:
@@
-232,7
+239,7
@@
wrappers:
- build-name:
wrappers:
- build-name:
- name: '$BUILD_NUMBER - Usecase: ${usecase} DeployType: ${deploy
-
type}'
+ name: '$BUILD_NUMBER - Usecase: ${usecase} DeployType: ${deploy
_
type}'
scm: *scm
scm: *scm