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
validation: iec: Pull docker images before run
[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
df14cbe
..
640923f
100644
(file)
--- 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
DEPLOY_SCENARIO={scenario}
same-node: true
block: true
+ - trigger-builds:
- project: 'validation-enea-daily-{stream}'
same-node: true
current-parameters: true
- project: 'validation-enea-daily-{stream}'
same-node: true
current-parameters: true
@@
-58,13
+59,19
@@
BLUEPRINT={project-name}
VERSION=master
OPTIONAL=false
BLUEPRINT={project-name}
VERSION=master
OPTIONAL=false
+ PULL=yes
block: true
- project:
!j2: |
block: true
- project:
!j2: |
+ {%- if deploy_type not in ['virtual'] -%}
{%- for uc in usecase -%}
{%- 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 %}
{%- if not loop.last -%},{%- endif -%}
{%- endfor %}
+ {%- endif -%}
current-parameters: true
same-node: true
block: true
current-parameters: true
same-node: true
block: true
@@
-121,17
+128,14
@@
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE'
scm: &scm
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE'
scm: &scm
- -
git
:
-
credentials-id
: '{jenkins-ssh-credential}'
- url: '{git-url}/{project}.git'
+ -
lf-infra-gerrit-scm
:
+
jenkins-ssh-credential
: '{jenkins-ssh-credential}'
+
git-
url: '{git-url}/{project}.git'
refspec: '$GERRIT_REFSPEC'
refspec: '$GERRIT_REFSPEC'
- branches: '$GERRIT_BRANCH'
- skip-tag: true
- wipe-workspace: true
- submodule:
- disable: true
- recursive: false
- timeout: '{submodule-timeout}'
+ branch: '$GERRIT_BRANCH'
+ submodule-recursive: false
+ submodule-timeout: '{submodule-timeout}'
+ submodule-disable: true
choosing-strategy: default
builders:
choosing-strategy: default
builders:
@@
-196,8
+200,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
@@
-209,6
+213,7
@@
branch: '{branch}'
- '{project}-defaults'
- '{installer}-{os}-defaults'
branch: '{branch}'
- '{project}-defaults'
- '{installer}-{os}-defaults'
+ - '{usecase}-defaults'
wrappers:
- build-name:
wrappers:
- build-name:
@@
-221,4
+226,3
@@
!include-raw-escape: ../iec/iec-{usecase}.sh
publishers: *publishers
!include-raw-escape: ../iec/iec-{usecase}.sh
publishers: *publishers
-