- centos7:
disabled: 'true'
+ ci-loop:
+ - daily
+
deploy-scenario:
- k8-calico-nofeature:
installer-type: kubespray
installer-type: kubespray
- k8-multus-nofeature:
installer-type: kubespray
+ - os-nosdn-nofeature:
+ installer-type: kolla
type:
- baremetal:
slave-label: 'baremetal-deploy'
yardstick-dispatcher: 'influxdb'
+ provisioner-type: 'bifrost'
phase:
- deploy:
- build-timeout: 60
+ build-timeout: 90
- functest:
- build-timeout: 120
+ build-timeout: 135
- yardstick:
build-timeout: 30
- promote:
build-timeout: 5
jobs:
- - '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
- - 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
+ - '{deploy-scenario}-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
+ - 'scenario-{distro}-{phase}-{type}-{ci-loop}-{stream}'
- job-template:
- name: '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
+ name: '{deploy-scenario}-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
project-type: multijob
name: USE_PREBUILT_DEPLOYMENT_IMAGE
default: 'true'
description: 'Use prebuilt deployment image while running as part of CI/CD'
+ - string:
+ name: PROVISIONER_TYPE
+ default: '{provisioner-type}'
+ description: 'Provisioner to use for provisioning nodes'
- string:
name: INSTALLER_TYPE
default: '{installer-type}'
blocking-jobs:
- 'cloud-infra-periodic-engine-.*'
- 'k8-.*'
+ - 'os-.*'
block-level: 'NODE'
- throttle:
max-per-node: 1
wrappers:
- build-timeout:
- timeout: 210
+ timeout: 245
- fix-workspace-permissions
scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: ''
+ wipe_workspace: true
+ clean_before: false
triggers:
- timed: '@daily'
builders:
- description-setter:
- description: $INSTALLER_TYPE
+ description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
- multijob:
name: deploy
condition: SUCCESSFUL
projects:
- - name: 'scenario-periodic-{distro}-deploy-{type}-{stream}'
+ - name: 'scenario-{distro}-deploy-{type}-{ci-loop}-{stream}'
current-parameters: true
predefined-parameters: |
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
+ PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
CLEANUP=$CLEANUP
name: functest
condition: SUCCESSFUL
projects:
- - name: 'scenario-periodic-{distro}-functest-{type}-{stream}'
+ - name: 'scenario-{distro}-functest-{type}-{ci-loop}-{stream}'
current-parameters: true
predefined-parameters: |
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
name: yardstick
condition: SUCCESSFUL
projects:
- - name: 'scenario-periodic-{distro}-yardstick-{type}-{stream}'
+ - name: 'scenario-{distro}-yardstick-{type}-{ci-loop}-{stream}'
current-parameters: true
predefined-parameters: |
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
name: promote
condition: SUCCESSFUL
projects:
- - name: 'scenario-periodic-{distro}-promote-{type}-{stream}'
+ - name: 'scenario-{distro}-promote-{type}-{ci-loop}-{stream}'
current-parameters: true
predefined-parameters: |
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
abort-all-job: true
- job-template:
- name: 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
+ name: 'scenario-{distro}-{phase}-{type}-{ci-loop}-{stream}'
disabled: false
name: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
description: 'Scenario to deploy and test'
+ - string:
+ name: PROVISIONER_TYPE
+ default: 'bifrost'
+ description: 'Provisioner to use for provisioning nodes'
- string:
name: INSTALLER_TYPE
default: 'kubespray'
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
branch: '{branch}'
refspec: ''
+ wipe_workspace: true
+ clean_before: false
builders:
- description-setter:
- description: $INSTALLER_TYPE - $DEPLOY_SCENARIO
+ description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
- 'scenario-{phase}-macro'
# vim: set ts=2 sw=2 expandtab: