Merge "Add capacity to airship CI cloud"

This commit is contained in:
Zuul 2020-02-07 21:51:46 +00:00 committed by Gerrit Code Review
commit f736763c81
1 changed files with 12 additions and 3 deletions

View File

@ -29,6 +29,8 @@ labels:
min-ready: 0 min-ready: 0
- name: ubuntu-bionic-expanded - name: ubuntu-bionic-expanded
min-ready: 0 min-ready: 0
- name: ubuntu-bionic-32GB
min-ready: 0
- name: multi-numa-ubuntu-bionic - name: multi-numa-ubuntu-bionic
min-ready: 0 min-ready: 0
- name: multi-numa-ubuntu-bionic-expanded - name: multi-numa-ubuntu-bionic-expanded
@ -373,7 +375,8 @@ providers:
diskimages: *provider_diskimages diskimages: *provider_diskimages
pools: pools:
- name: main - name: main
max-servers: 0 # Canary capacity (by memory less than half capacity of airship pool).
max-servers: 10
labels: labels:
- name: centos-7 - name: centos-7
min-ram: 8000 min-ram: 8000
@ -433,14 +436,20 @@ providers:
# TODO add nested virt labels once confirmed nested virt works # TODO add nested virt labels once confirmed nested virt works
# to some degree. # to some degree.
- name: airship - name: airship
max-servers: 0 # Jobs expected to run 1x 32GB instance + 3x 16GB instances with
# goal of running 4 jobs concurrently.
max-servers: 16
labels: labels:
# TODO figure out what flavors are needed here
- name: ubuntu-bionic-expanded - name: ubuntu-bionic-expanded
min-ram: 16000 min-ram: 16000
flavor-name: '8C-16GB-100GB' flavor-name: '8C-16GB-100GB'
diskimage: ubuntu-bionic diskimage: ubuntu-bionic
key-name: infra-root-keys-2018-06-15 key-name: infra-root-keys-2018-06-15
- name: ubuntu-bionic-32GB
min-ram: 32000
flavor-name: '8C-32GB-100GB'
diskimage: ubuntu-bionic
key-name: infra-root-keys-2018-06-15
diskimages: diskimages:
- name: centos-7 - name: centos-7