From b56c97697c77da391866cee8979dd5dc4563572a Mon Sep 17 00:00:00 2001 From: jingzhao Date: Mon, 25 Nov 2019 18:14:49 +0800 Subject: [PATCH] IEC jobs in Akraino Lab 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 Change-Id: Ida4a22a1c39a8171f2fd48cde79aa8dd7008b707 --- jjb/iec/iec.yaml | 73 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml index 622c88a..9751825 100644 --- a/jjb/iec/iec.yaml +++ b/jjb/iec/iec.yaml @@ -30,7 +30,14 @@ - ubuntu1604 - ubuntu1804 - centos7 - + #-------------------------------- + # IEC TYPE DEFINITINONS + # type1 Mcbin embeded board + # type2 Arm Server + # ------------------------------- + iecType: + - type1 + - type2 # ------------------------------- # DEPLOY TYPE DEFINITIONS # ------------------------------- @@ -50,6 +57,8 @@ os: centos7 - installer: compass os: ubuntu1804 + - iecType: type1 + installer: fuel # ------------------------------- # USECASE DEFINITIONS @@ -60,10 +69,10 @@ 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 # @@ -145,7 +154,7 @@ # 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}' @@ -164,10 +173,10 @@ wrappers: - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO $IEC_TYPE' triggers: - - 'iec-{installer}-{deploy_type}-{os}-daily-{stream}-trigger' + - 'iec-{iecType}-{installer}-{deploy_type}-{os}-daily-{stream}-trigger' parameters: - lf-infra-parameters: @@ -179,10 +188,13 @@ - string: name: DEPLOY_SCENARIO default: '{scenario}' + - string: + name: IEC_TYPE + default: '{iecType}' 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} @@ -200,7 +212,7 @@ - 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 @@ -210,15 +222,16 @@ 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} + IEC_TYPE='{iecType}' 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 @@ -230,9 +243,9 @@ - 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: @@ -244,13 +257,16 @@ - string: name: DEPLOY_SCENARIO default: '{scenario}' + - string: + name: IEC_TYPE + default: '{iecType}' - 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' scm: &scm - git: @@ -295,7 +311,7 @@ - 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 @@ -308,6 +324,9 @@ - string: name: DEPLOY_SCENARIO default: '{scenario}' + - string: + name: IEC_TYPE + default: '{iecType}' - string: name: EXTRA_ARGS default: '-EEE -o {os}' @@ -324,7 +343,7 @@ 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 @@ -356,30 +375,34 @@ # 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: - name: 'iec-fuel-baremetal-ubuntu1604-daily-master-trigger' + name: 'iec-type2-fuel-baremetal-ubuntu1604-daily-master-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: - name: 'iec-fuel-virtual-ubuntu1804-daily-master-trigger' + name: 'iec-type2-fuel-virtual-ubuntu1804-daily-master-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: - name: 'iec-fuel-virtual-centos7-daily-master-trigger' + name: 'iec-type2-fuel-virtual-centos7-daily-master-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' triggers: - timed: '' +- trigger: + name: 'iec-type1-compass-virtual-ubuntu1604-daily-master-trigger' + triggers: + - timed: '0 19 * * *' -- 2.16.6