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
0f62307
..
c60e915
100644
(file)
--- a/
jjb/akraino-templates/akraino-iec-templates.yaml
+++ b/
jjb/akraino-templates/akraino-iec-templates.yaml
@@
-56,16
+56,20
@@
CLUSTER_SSH_PASSWORD=$K8S_SSH_PASSWORD
CLUSTER_SSH_KEY=$K8S_SSH_KEY
BLUEPRINT={project-name}
CLUSTER_SSH_PASSWORD=$K8S_SSH_PASSWORD
CLUSTER_SSH_KEY=$K8S_SSH_KEY
BLUEPRINT={project-name}
- LAYER=k8s
VERSION=master
OPTIONAL=false
block: true
- project:
!j2: |
VERSION=master
OPTIONAL=false
block: true
- project:
!j2: |
+ {%- if deploy_type not in ['virtual'] -%}
{%- for uc in usecase -%}
{%- for uc in usecase -%}
- iec-{{ iecType }}-install-{{ uc | first }}-{{ 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
@@
-125,9
+129,8
@@
- git:
credentials-id: '{jenkins-ssh-credential}'
url: '{git-url}/{project}.git'
- git:
credentials-id: '{jenkins-ssh-credential}'
url: '{git-url}/{project}.git'
- refspec: ''
- branches:
- - 'refs/heads/{branch}'
+ refspec: '$GERRIT_REFSPEC'
+ branches: '$GERRIT_BRANCH'
skip-tag: true
wipe-workspace: true
submodule:
skip-tag: true
wipe-workspace: true
submodule:
@@
-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
-