summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
9e7f5f4)
In this patch, some modifications are completed based on the R2
requirements.
1. The IEC type is added into name of jenkins jobs.
2. The new IEC-type1 job is added into Akraino CI/CD.
The IEC-type1 job is designed to verify the IEC task on Edge
node. In this job, 2 VMs will be started for simulating the
Low-power remote-edge nodes in the host. After that, the IEC
basic infrastructure will be deployed on it for verifying the
user case.
Signed-off-by: jingzhao <Jingzhao.Ni@arm.com>
Change-Id: Ida4a22a1c39a8171f2fd48cde79aa8dd7008b707
- ubuntu1604
- ubuntu1804
- centos7
- ubuntu1604
- ubuntu1804
- centos7
+ #--------------------------------
+ # IEC TYPE DEFINITINONS
+ # type1 Mcbin embeded board
+ # type2 Arm Server
+ # -------------------------------
+ iecType:
+ - type1
+ - type2
# -------------------------------
# DEPLOY TYPE DEFINITIONS
# -------------------------------
# -------------------------------
# DEPLOY TYPE DEFINITIONS
# -------------------------------
os: centos7
- installer: compass
os: ubuntu1804
os: centos7
- installer: compass
os: ubuntu1804
+ - iecType: type1
+ installer: fuel
# -------------------------------
# USECASE DEFINITIONS
# -------------------------------
# USECASE DEFINITIONS
scenario: 'k8-calico-iec-noha'
jobs:
scenario: 'k8-calico-iec-noha'
jobs:
- - 'iec-{installer}-{deploy_type}-{os}-daily-{stream}'
- - 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
- - 'iec-destroy-{installer}-{deploy_type}-{os}-daily-{stream}'
- - 'iec-install-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
+ - 'iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}'
+ - 'iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
+ - 'iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}'
+ - 'iec-{iecType}-install-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
##############
# PARAMETERS #
##############
# PARAMETERS #
# job templates
########################
- job-template:
# job templates
########################
- job-template:
- name: 'iec-{installer}-{deploy_type}-{os}-daily-{stream}'
+ name: 'iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}'
disabled: '{obj:disabled}'
concurrent: false
node: '{slave-label}'
disabled: '{obj:disabled}'
concurrent: false
node: '{slave-label}'
- name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+ name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE'
- - 'iec-{installer}-{deploy_type}-{os}-daily-{stream}-trigger'
+ - 'iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}-trigger'
parameters:
- lf-infra-parameters:
parameters:
- lf-infra-parameters:
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
+ - string:
+ name: IEC_TYPE
+ default: '{iecType}'
builders:
- trigger-builds:
builders:
- trigger-builds:
- - project: 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
+ - project: 'iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
current-parameters: true
predefined-parameters:
DEPLOY_SCENARIO={scenario}
current-parameters: true
predefined-parameters:
DEPLOY_SCENARIO={scenario}
- project:
!j2: |
{%- for uc in usecase -%}
- project:
!j2: |
{%- for uc in usecase -%}
- iec-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
+ iec-{{ iecType }}-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
{%- if not loop.last -%},{%- endif -%}
{%- endfor %}
current-parameters: true
{%- if not loop.last -%},{%- endif -%}
{%- endfor %}
current-parameters: true
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
- - project: 'iec-destroy-{installer}-{deploy_type}-{os}-daily-{stream}'
+ - project: 'iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}'
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO={scenario}
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO={scenario}
same-node: true
block: true
- job-template:
same-node: true
block: true
- job-template:
- name: 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
+ name: 'iec-{iecType}-deploy-{installer}-{deploy_type}-{os}-daily-{stream}'
concurrent: true
node: '{slave-label}'
properties: &properties
concurrent: true
node: '{slave-label}'
properties: &properties
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '.*-deploy-{installer}-{deploy_type}-.*'
- - '.*-destroy-{installer}-{deploy_type}-.*'
- - '.*-install-.*-{installer}-{deploy_type}-.*'
+ - '.*-{iecType}-deploy-{installer}-{deploy_type}-.*'
+ - '.*-{iecType}-destroy-{installer}-{deploy_type}-.*'
+ - '.*-{iecType}-install-.*-{installer}-{deploy_type}-.*'
blocking-level: 'NODE'
parameters:
blocking-level: 'NODE'
parameters:
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
+ - string:
+ name: IEC_TYPE
+ default: '{iecType}'
- string:
name: EXTRA_ARGS
default: '-o {os}'
wrappers: &wrappers
- build-name:
- string:
name: EXTRA_ARGS
default: '-o {os}'
wrappers: &wrappers
- build-name:
- name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+ name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE'
- lf-infra-publish
- job-template:
- lf-infra-publish
- job-template:
- name: 'iec-destroy-{installer}-{deploy_type}-{os}-daily-{stream}'
+ name: 'iec-{iecType}-destroy-{installer}-{deploy_type}-{os}-daily-{stream}'
concurrent: true
node: '{slave-label}'
properties: *properties
concurrent: true
node: '{slave-label}'
properties: *properties
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
+ - string:
+ name: IEC_TYPE
+ default: '{iecType}'
- string:
name: EXTRA_ARGS
default: '-EEE -o {os}'
- string:
name: EXTRA_ARGS
default: '-EEE -o {os}'
publishers: *publishers
- job-template:
publishers: *publishers
- job-template:
- name: 'iec-install-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
+ name: 'iec-{iecType}-install-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
concurrent: true
node: '{slave-label}'
properties: *properties
concurrent: true
node: '{slave-label}'
properties: *properties
# Akraino IEC CI Baremetal Triggers running against master branch
# ----------------------------------------------------------------
- trigger:
# Akraino IEC CI Baremetal Triggers running against master branch
# ----------------------------------------------------------------
- trigger:
- name: 'iec-fuel-virtual-ubuntu1604-daily-master-trigger'
+ name: 'iec-type2-fuel-virtual-ubuntu1604-daily-master-trigger'
triggers:
- timed: '0 1 * * 1,3,5'
- trigger:
triggers:
- timed: '0 1 * * 1,3,5'
- trigger:
- name: 'iec-fuel-baremetal-ubuntu1604-daily-master-trigger'
+ name: 'iec-type2-fuel-baremetal-ubuntu1604-daily-master-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'iec-compass-virtual-ubuntu1604-daily-master-trigger'
+ name: 'iec-type2-compass-virtual-ubuntu1604-daily-master-trigger'
triggers:
- timed: '0 13 * * *'
- trigger:
triggers:
- timed: '0 13 * * *'
- trigger:
- name: 'iec-fuel-virtual-ubuntu1804-daily-master-trigger'
+ name: 'iec-type2-fuel-virtual-ubuntu1804-daily-master-trigger'
triggers:
- timed: '0 1 * * 2,6'
- trigger:
triggers:
- timed: '0 1 * * 2,6'
- trigger:
- name: 'iec-fuel-baremetal-ubuntu1804-daily-master-trigger'
+ name: 'iec-type2-fuel-baremetal-ubuntu1804-daily-master-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'iec-fuel-virtual-centos7-daily-master-trigger'
+ name: 'iec-type2-fuel-virtual-centos7-daily-master-trigger'
triggers:
- timed: '0 1 * * 4,7'
- trigger:
triggers:
- timed: '0 1 * * 4,7'
- trigger:
- name: 'iec-fuel-baremetal-centos7-daily-master-trigger'
+ name: 'iec-type2-fuel-baremetal-centos7-daily-master-trigger'
+- trigger:
+ name: 'iec-type1-compass-virtual-ubuntu1604-daily-master-trigger'
+ triggers:
+ - timed: '0 19 * * *'