6a56940275
In a situation with multiple builders, each configured with different providers, it is possible for one builder to delete the ZK ImageBuild record for a build from another builder between the time that the build is completed but before the first upload starts. This is because every builder looks for images to delete from ZK. It keeps the 2 most recent ready images (this should normally cover the time period between a build and upload), unless the image is not configured for any provider this builder knows about. This is where the disjoint providers come into play -- builder1 in our scenario is not expected to have a configuration for provider2. To correct this, we adjust this check so that the only time we bypass the 2-most-recent-ready-images check is if the diskimage is not configured at all. That means that we still expect all builders to have a "diskimage" entry for every image, but we don't need those to be configured for any providers which this builder is not expected to handle. Change-Id: Ic2fefda293fa0bcbc98ee7313198b37df0576299
65 lines
1.5 KiB
YAML
65 lines
1.5 KiB
YAML
elements-dir: .
|
|
images-dir: '{images_dir}'
|
|
build-log-dir: '{build_log_dir}'
|
|
build-log-retention: 1
|
|
|
|
zookeeper-servers:
|
|
- host: {zookeeper_host}
|
|
port: {zookeeper_port}
|
|
chroot: {zookeeper_chroot}
|
|
|
|
zookeeper-tls:
|
|
ca: {zookeeper_ca}
|
|
cert: {zookeeper_cert}
|
|
key: {zookeeper_key}
|
|
|
|
labels:
|
|
- name: fake-label1
|
|
- name: fake-label2
|
|
|
|
providers:
|
|
- name: fake-provider1
|
|
cloud: fake
|
|
driver: fake
|
|
region-name: fake-region
|
|
rate: 0.0001
|
|
diskimages:
|
|
- name: fake-image1
|
|
pools:
|
|
- name: main
|
|
max-servers: 96
|
|
availability-zones:
|
|
- az1
|
|
networks:
|
|
- net-name
|
|
labels:
|
|
- name: fake-label1
|
|
diskimage: fake-image1
|
|
min-ram: 8192
|
|
flavor-name: 'Fake'
|
|
|
|
diskimages:
|
|
- name: fake-image1
|
|
elements:
|
|
- fedora
|
|
- vm
|
|
release: 21
|
|
dib-cmd: nodepool/tests/fake-image-create
|
|
env-vars:
|
|
TMPDIR: /opt/dib_tmp
|
|
DIB_IMAGE_CACHE: /opt/dib_cache
|
|
DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/
|
|
BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2
|
|
|
|
- name: fake-image2
|
|
elements:
|
|
- fedora
|
|
- vm
|
|
release: 21
|
|
dib-cmd: nodepool/tests/fake-image-create
|
|
env-vars:
|
|
TMPDIR: /opt/dib_tmp
|
|
DIB_IMAGE_CACHE: /opt/dib_cache
|
|
DIB_CLOUD_IMAGES: http://download.fedoraproject.org/pub/fedora/linux/releases/test/21-Beta/Cloud/Images/x86_64/
|
|
BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2
|