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
ta: iso deploy: Fix artifact name in checksum file
[ci-management.git]
/
jjb
/
iec
/
iec.yaml
diff --git
a/jjb/iec/iec.yaml
b/jjb/iec/iec.yaml
index
1c4a758
..
622c88a
100644
(file)
--- a/
jjb/iec/iec.yaml
+++ b/
jjb/iec/iec.yaml
@@
-4,7
+4,9
@@
project-name: 'iec'
project: '{project-name}'
views:
project-name: 'iec'
project: '{project-name}'
views:
- - project-view
+ - common-view:
+ view-name: iec
+ view-regex: '^{project-name}-(tox|fuel|compass)-.*'
# -------------------------------
# BRANCH DEFINITIONS
# -------------------------------
# -------------------------------
# BRANCH DEFINITIONS
# -------------------------------
@@
-89,33
+91,55
@@
name: ARCHIVE_ARTIFACTS
default: '**/*.log'
description: Artifacts to archive to the logs server.
name: ARCHIVE_ARTIFACTS
default: '**/*.log'
description: Artifacts to archive to the logs server.
-- parameter:
- name: 'seba_on_arm-defaults'
+# Usecase params are both installer and OS specific
+- parameter: &k8s_fuel_ubuntu1604_parameter
+ name: 'fuel-ubuntu1604-defaults'
parameters:
parameters:
- - string:
+ - string: &k8s_master_ip
+ name: K8S_MASTER_IP
+ default: '172.16.10.36'
+ description: 'IP address to connect to the K8s master'
+ - string: &k8s_ssh_user
name: K8S_SSH_USER
default: 'ubuntu'
description: 'SSH username to connect to the K8s master '
name: K8S_SSH_USER
default: 'ubuntu'
description: 'SSH username to connect to the K8s master '
- - string:
+ - string:
&k8s_ssh_password
name: K8S_SSH_PASSWORD
default: ''
description: 'SSH password to connect to the K8s master'
name: K8S_SSH_PASSWORD
default: ''
description: 'SSH password to connect to the K8s master'
- - string:
+ - string:
&k8s_ssh_key
name: K8S_SSH_KEY
name: K8S_SSH_KEY
- default: ''
+ default: '
/var/lib/opnfv/mcp.rsa
'
description: 'SSH key to connect to the K8s master'
description: 'SSH key to connect to the K8s master'
+- parameter:
+ <<: *k8s_fuel_ubuntu1604_parameter
+ name: 'fuel-ubuntu1804-defaults'
+- parameter:
+ name: 'fuel-centos7-defaults'
+ parameters:
+ - string:
+ <<: *k8s_master_ip
- string:
- string:
- name: K8S_MASTER_IP_COMPASS
+ <<: *k8s_ssh_user
+ default: 'centos'
+ - string:
+ <<: *k8s_ssh_password
+ - string:
+ <<: *k8s_ssh_key
+- parameter:
+ name: 'compass-ubuntu1604-defaults'
+ parameters:
+ - string:
+ <<: *k8s_master_ip
default: '10.1.0.50'
default: '10.1.0.50'
- description: 'IP address to compass connect to the K8s master'
- string:
- string:
- name: K8S_SSH_PASSWORD_COMPASS
+ <<: *k8s_ssh_user
default: 'root'
default: 'root'
- description: 'SSH password to compass connect to the K8s master'
- string:
- string:
- name: K8S_SSH_USER_COMPASS
+ <<: *k8s_ssh_password
default: 'root'
default: 'root'
- description: 'SSH username to compass connect to the K8s master'
+ - string:
+ <<: *k8s_ssh_key
########################
# job templates
########################
# job templates
@@
-151,6
+175,7
@@
stream: '{stream}'
branch: '{branch}'
- '{project}-defaults'
stream: '{stream}'
branch: '{branch}'
- '{project}-defaults'
+ - '{installer}-{os}-defaults'
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
@@
-158,18
+183,27
@@
builders:
- trigger-builds:
- project: 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
builders:
- trigger-builds:
- project: 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
- current-parameters:
fals
e
+ current-parameters:
tru
e
predefined-parameters:
DEPLOY_SCENARIO={scenario}
same-node: true
block: true
predefined-parameters:
DEPLOY_SCENARIO={scenario}
same-node: true
block: true
+ - project: 'validation-enea-daily-{stream}'
+ same-node: true
+ current-parameters: true
+ predefined-parameters: |
+ BLUEPRINT={project-name}
+ LAYER=k8s
+ VERSION=master
+ OPTIONAL=yes
+ block: true
- project:
!j2: |
{%- for uc in usecase -%}
iec-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
{%- if not loop.last -%},{%- endif -%}
{%- endfor %}
- project:
!j2: |
{%- for uc in usecase -%}
iec-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
{%- if not loop.last -%},{%- endif -%}
{%- endfor %}
- current-parameters:
fals
e
+ current-parameters:
tru
e
same-node: true
block: true
block-thresholds:
same-node: true
block: true
block-thresholds:
@@
-301,7
+335,6
@@
stream: '{stream}'
branch: '{branch}'
- '{project}-defaults'
stream: '{stream}'
branch: '{branch}'
- '{project}-defaults'
- - '{usecase}-defaults'
wrappers:
- build-name:
wrappers:
- build-name: