branch: '{stream}'
disabled: 'false'
- distro:
- - ubuntu1604
+ os:
+ - ubuntu1604:
+ distribution: ubuntu16
+ disabled: 'false'
+ - ubuntu1804:
+ distribution: ubuntu18
+ disabled: 'true'
+ - centos7:
+ distribution: centos7
+ disabled: 'true'
type:
- virtual
- test
jobs:
- - 'cloud-infra-verify-{distro}-{type}-{stream}'
- - 'cloud-infra-verify-{distro}-{phase}-{type}-{stream}'
+ - 'cloud-infra-verify-{os}-{type}-{stream}'
+ - 'cloud-infra-verify-{os}-{phase}-{type}-{stream}'
- job-template:
- name: 'cloud-infra-verify-{distro}-{type}-{stream}'
+ name: 'cloud-infra-verify-{os}-{type}-{stream}'
project-type: multijob
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- default: 'cloud-infra-vpod'
+ default: 'vpod-deploy-{os}'
- string:
name: DISTRO
- default: '{distro}'
+ default: '{os}'
- string:
name: CLEANUP
default: 'true'
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'cloud-infra-verify-{distro}-.*'
+ - 'cloud-infra-verify-{os}-.*'
- 'cloud-infra-os-.*'
- 'cloud-infra-k8-.*'
block-level: 'NODE'
name: deploy
condition: SUCCESSFUL
projects:
- - name: 'cloud-infra-verify-{distro}-deploy-{type}-{stream}'
+ - name: 'cloud-infra-verify-{os}-deploy-{type}-{stream}'
current-parameters: true
predefined-parameters: |
- DISTRO={distro}
+ DISTRIBUTION={distribution}
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
name: test
condition: SUCCESSFUL
projects:
- - name: 'cloud-infra-verify-{distro}-test-{type}-{stream}'
+ - name: 'cloud-infra-verify-{os}-test-{type}-{stream}'
current-parameters: true
predefined-parameters: |
- DISTRO={distro}
+ DISTRIBUTION={distribution}
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
abort-all-job: true
- job-template:
- name: 'cloud-infra-verify-{distro}-{phase}-{type}-{stream}'
+ name: 'cloud-infra-verify-{os}-{phase}-{type}-{stream}'
disabled: false