X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-iec-templates.yaml;h=c60e915f201c062ecdae5e61f305b54e947382e2;hp=df14cbe4fa0f029c26d6ea123c16baa6cf3a3f05;hb=c1b6901cf2821ce7c9fe422d33ad33f04dca3dee;hpb=bc7b1438041402599cdcff0433c4c8ab62c8348d diff --git a/jjb/akraino-templates/akraino-iec-templates.yaml b/jjb/akraino-templates/akraino-iec-templates.yaml index df14cbe..c60e915 100644 --- a/jjb/akraino-templates/akraino-iec-templates.yaml +++ b/jjb/akraino-templates/akraino-iec-templates.yaml @@ -61,10 +61,15 @@ block: true - project: !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 -%} current-parameters: true same-node: true block: true @@ -196,8 +201,8 @@ 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 @@ -209,6 +214,7 @@ branch: '{branch}' - '{project}-defaults' - '{installer}-{os}-defaults' + - '{usecase}-defaults' wrappers: - build-name: @@ -221,4 +227,3 @@ !include-raw-escape: ../iec/iec-{usecase}.sh publishers: *publishers -