X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-iec-templates.yaml;h=f71da2809f4f2fe99c41b48c65c4156cd99432ce;hb=5165ff7704d136adc4f3dd7885c8ad21b2375f1a;hp=df14cbe4fa0f029c26d6ea123c16baa6cf3a3f05;hpb=9b38c85c328d9ab05ac396ad68d8ecd2e79d1ff4;p=ci-management.git diff --git a/jjb/akraino-templates/akraino-iec-templates.yaml b/jjb/akraino-templates/akraino-iec-templates.yaml index df14cbe..f71da28 100644 --- a/jjb/akraino-templates/akraino-iec-templates.yaml +++ b/jjb/akraino-templates/akraino-iec-templates.yaml @@ -47,6 +47,7 @@ DEPLOY_SCENARIO={scenario} same-node: true block: true + - trigger-builds: - project: 'validation-enea-daily-{stream}' same-node: true current-parameters: true @@ -61,10 +62,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 +202,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 +215,7 @@ branch: '{branch}' - '{project}-defaults' - '{installer}-{os}-defaults' + - '{usecase}-defaults' wrappers: - build-name: @@ -221,4 +228,3 @@ !include-raw-escape: ../iec/iec-{usecase}.sh publishers: *publishers -