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 "iec: exclude seba_on_arm from virtual PODs"
[ci-management.git]
/
jjb
/
akraino-templates
/
akraino-iec-templates.yaml
diff --git
a/jjb/akraino-templates/akraino-iec-templates.yaml
b/jjb/akraino-templates/akraino-iec-templates.yaml
index
9fba10c
..
c60e915
100644
(file)
--- a/
jjb/akraino-templates/akraino-iec-templates.yaml
+++ b/
jjb/akraino-templates/akraino-iec-templates.yaml
@@
-63,7
+63,10
@@
!j2: |
{%- if deploy_type not in ['virtual'] -%}
{%- for uc in usecase -%}
!j2: |
{%- if deploy_type not in ['virtual'] -%}
{%- for uc in usecase -%}
- iec-{{ iecType }}-install-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
+ {%- for ph in phase -%}
+ iec-{{ iecType }}-{{ ph }}-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
+ {%- if not loop.last -%},{%- endif -%}
+ {%- endfor %}
{%- if not loop.last -%},{%- endif -%}
{%- endfor %}
{%- endif -%}
{%- if not loop.last -%},{%- endif -%}
{%- endfor %}
{%- endif -%}
@@
-198,8
+201,8
@@
publishers: *publishers
- job-template:
publishers: *publishers
- job-template:
- id: akraino-iec-
install
-usecase
- name: 'iec-{iecType}-
install
-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
+ id: akraino-iec-
phase
-usecase
+ name: 'iec-{iecType}-
{phase}
-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
concurrent: true
node: '{slave-label}'
properties: *properties
concurrent: true
node: '{slave-label}'
properties: *properties
@@
-211,6
+214,7
@@
branch: '{branch}'
- '{project}-defaults'
- '{installer}-{os}-defaults'
branch: '{branch}'
- '{project}-defaults'
- '{installer}-{os}-defaults'
+ - '{usecase}-defaults'
wrappers:
- build-name:
wrappers:
- build-name:
@@
-223,4
+227,3
@@
!include-raw-escape: ../iec/iec-{usecase}.sh
publishers: *publishers
!include-raw-escape: ../iec/iec-{usecase}.sh
publishers: *publishers
-