diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2016-11-29 12:26:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-29 12:26:51 +0000 |
| commit | aa11069e56842a36c24946753e13eb611613bb69 (patch) | |
| tree | 8fb1d04c871ce2ebd00a7e61ea26dc47dcdb7e1c /jjb | |
| parent | 85615f4c81d269b330fdc51f7c69523b8bcfc4b7 (diff) | |
| parent | cae26c51e5f555c8993037a2a716d135aae48e3c (diff) | |
Merge "jjb: infra: Fix and enable the SUSE job for bifrost"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/infra/bifrost-verify-jobs.yml | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml index b1fa02b6d..be3cf9a0e 100644 --- a/jjb/infra/bifrost-verify-jobs.yml +++ b/jjb/infra/bifrost-verify-jobs.yml @@ -33,11 +33,15 @@ dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl' extra-dib-elements: 'openssh-server' - 'suse': - disabled: true - dib-os-release: 'suse' - dib-os-element: 'suse' - dib-os-packages: '' + disabled: false + dib-os-release: '42.2' + dib-os-element: 'opensuse-minimal' + # python-xml is needed until https://review.openstack.org/#/c/400150/ is merged + dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl,python-xml' extra-dib-elements: 'openssh-server' + vm-disk: '30' + vm-memory: '4096' + vm-cpu: '2' #-------------------------------- # type #-------------------------------- @@ -48,6 +52,16 @@ #-------------------------------- jobs: - '{project}-bifrost-verify-{distro}-{type}-{stream}' + +#-------------------------------- +# VM defaults +#-------------------------------- +- defaults: + name: vm_defaults + vm-disk: '100' + vm-memory: '8192' + vm-cpu: '4' + #-------------------------------- # job templates #-------------------------------- @@ -56,6 +70,8 @@ disabled: '{obj:disabled}' + defaults: vm_defaults + concurrent: false properties: @@ -91,6 +107,15 @@ name: DIB_OS_PACKAGES default: '{dib-os-packages}' - string: + name: VM_DISK + default: '{vm-disk}' + - string: + name: VM_MEMORY + default: '{vm-memory}' + - string: + name: VM_CPU + default: '{vm-cpu}' + - string: name: CLEAN_DIB_IMAGES default: 'true' - label: |