X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fiec%2Fiec.yaml;h=6b3ac0937fabddd340afa0b2d2886169a0354fee;hp=0e6308c34abef5f28930708384c73b84fb8eb755;hb=e2ba355c1af4c10253e4d89554dd2e31a31af6e0;hpb=6c33d9285748512a6f857112b880c65c3fc3af05 diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml index 0e6308c..6b3ac09 100644 --- a/jjb/iec/iec.yaml +++ b/jjb/iec/iec.yaml @@ -21,6 +21,14 @@ - fuel - compass + # ------------------------------- + # OPERATING SYSTEM DEFINITIONS + # ------------------------------- + os: + - ubuntu1604 + - ubuntu1804 + - centos7 + # ------------------------------- # DEPLOY TYPE DEFINITIONS # ------------------------------- @@ -36,6 +44,10 @@ # Compass does not run against baremetal PODs yet - installer: compass deploy_type: baremetal + - installer: compass + os: centos7 + - installer: compass + os: ubuntu1804 # ------------------------------- # USECASE DEFINITIONS @@ -46,10 +58,10 @@ scenario: 'k8-calico-iec-noha' jobs: - - 'iec-{installer}-{deploy_type}-daily-{stream}' - - 'iec-deploy-{installer}-{deploy_type}-daily-{stream}' - - 'iec-destroy-{installer}-{deploy_type}-daily-{stream}' - - 'iec-install-{usecase}-{installer}-{deploy_type}-daily-{stream}' + - '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}' ############## # PARAMETERS # @@ -77,39 +89,61 @@ 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: 'seba_on_arm-fuel-ubuntu1604-defaults' parameters: - - string: + - string: &k8s_master_ip + name: K8S_MASTER_IP + default: '' + 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 ' - - string: + - string: &k8s_ssh_password name: K8S_SSH_PASSWORD default: '' description: 'SSH password to connect to the K8s master' - - string: + - string: &k8s_ssh_key name: K8S_SSH_KEY default: '' description: 'SSH key to connect to the K8s master' +- parameter: + <<: *k8s_fuel_ubuntu1604_parameter + name: 'seba_on_arm-fuel-ubuntu1804-defaults' +- parameter: + name: 'seba_on_arm-fuel-centos7-defaults' + parameters: + - string: + <<: *k8s_master_ip + - string: + <<: *k8s_ssh_user + default: 'centos' + - string: + <<: *k8s_ssh_password - string: - name: K8S_MASTER_IP_COMPASS + <<: *k8s_ssh_key +- parameter: + name: 'seba_on_arm-compass-ubuntu1604-defaults' + parameters: + - string: + <<: *k8s_master_ip default: '10.1.0.50' - description: 'IP address to compass connect to the K8s master' - string: - name: K8S_SSH_PASSWORD_COMPASS + <<: *k8s_ssh_user default: 'root' - description: 'SSH password to compass connect to the K8s master' - string: - name: K8S_SSH_USER_COMPASS + <<: *k8s_ssh_password default: 'root' - description: 'SSH username to compass connect to the K8s master' + - string: + <<: *k8s_ssh_key ######################## # job templates ######################## - job-template: - name: 'iec-{installer}-{deploy_type}-daily-{stream}' + name: 'iec-{installer}-{deploy_type}-{os}-daily-{stream}' disabled: '{obj:disabled}' concurrent: false node: '{slave-label}' @@ -122,8 +156,8 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '.*-fuel-{deploy_type}-daily-.*' - - '.*-compass-{deploy_type}-daily-.*' + - '.*-fuel-{deploy_type}-.*' + - '.*-compass-{deploy_type}-.*' blocking-level: 'NODE' wrappers: @@ -131,7 +165,7 @@ name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' triggers: - - 'iec-{installer}-{deploy_type}-daily-{stream}-trigger' + - 'iec-{installer}-{deploy_type}-{os}-daily-{stream}-trigger' parameters: - lf-infra-parameters: @@ -145,7 +179,7 @@ builders: - trigger-builds: - - project: 'iec-deploy-{installer}-{deploy_type}-daily-{stream}' + - project: 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -154,7 +188,7 @@ - project: !j2: | {%- for uc in usecase -%} - iec-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-daily-{{ stream }} + iec-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }} {%- if not loop.last -%},{%- endif -%} {%- endfor %} current-parameters: false @@ -164,7 +198,7 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' - - project: 'iec-destroy-{installer}-{deploy_type}-daily-{stream}' + - project: 'iec-destroy-{installer}-{deploy_type}-{os}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -172,7 +206,7 @@ block: true - job-template: - name: 'iec-deploy-{installer}-{deploy_type}-daily-{stream}' + name: 'iec-deploy-{installer}-{deploy_type}-{os}-daily-{stream}' concurrent: true node: '{slave-label}' properties: &properties @@ -184,9 +218,9 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '.*-deploy-{installer}-{deploy_type}-daily-.*' - - '.*-destroy-{installer}-{deploy_type}-daily-.*' - - '.*-install-.*-{installer}-{deploy_type}-daily-.*' + - '.*-deploy-{installer}-{deploy_type}-.*' + - '.*-destroy-{installer}-{deploy_type}-.*' + - '.*-install-.*-{installer}-{deploy_type}-.*' blocking-level: 'NODE' parameters: @@ -198,6 +232,9 @@ - string: name: DEPLOY_SCENARIO default: '{scenario}' + - string: + name: EXTRA_ARGS + default: '-o {os}' wrappers: &wrappers - build-name: @@ -246,7 +283,7 @@ - lf-infra-publish - job-template: - name: 'iec-destroy-{installer}-{deploy_type}-daily-{stream}' + name: 'iec-destroy-{installer}-{deploy_type}-{os}-daily-{stream}' concurrent: true node: '{slave-label}' properties: *properties @@ -261,7 +298,7 @@ default: '{scenario}' - string: name: EXTRA_ARGS - default: '-EEE' + default: '-EEE -o {os}' wrappers: *wrappers scm: *scm @@ -275,7 +312,7 @@ publishers: *publishers - job-template: - name: 'iec-install-{usecase}-{installer}-{deploy_type}-daily-{stream}' + name: 'iec-install-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}' concurrent: true node: '{slave-label}' properties: *properties @@ -286,7 +323,7 @@ stream: '{stream}' branch: '{branch}' - '{project}-defaults' - - '{usecase}-defaults' + - '{usecase}-{installer}-{os}-defaults' wrappers: - build-name: @@ -308,14 +345,30 @@ # Akraino IEC CI Baremetal Triggers running against master branch # ---------------------------------------------------------------- - trigger: - name: 'iec-fuel-virtual-daily-master-trigger' + name: 'iec-fuel-virtual-ubuntu1604-daily-master-trigger' triggers: - - timed: '0 1 * * *' + - timed: '0 1 * * 1,3,5' - trigger: - name: 'iec-fuel-baremetal-daily-master-trigger' + name: 'iec-fuel-baremetal-ubuntu1604-daily-master-trigger' triggers: - timed: '' - trigger: - name: 'iec-compass-virtual-daily-master-trigger' + name: 'iec-compass-virtual-ubuntu1604-daily-master-trigger' triggers: - timed: '0 13 * * *' +- trigger: + name: 'iec-fuel-virtual-ubuntu1804-daily-master-trigger' + triggers: + - timed: '0 1 * * 2,6' +- trigger: + name: 'iec-fuel-baremetal-ubuntu1804-daily-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'iec-fuel-virtual-centos7-daily-master-trigger' + triggers: + - timed: '0 1 * * 4,7' +- trigger: + name: 'iec-fuel-baremetal-centos7-daily-master-trigger' + triggers: + - timed: ''