Merge "container functional test : allow to specify elements-dir"
This commit is contained in:
commit
9d2d6cf942
|
@ -35,6 +35,11 @@
|
||||||
|
|
||||||
The base element to use when building the disk image.
|
The base element to use when building the disk image.
|
||||||
|
|
||||||
|
.. zuul:jobvar:: elements-dir
|
||||||
|
:type: string
|
||||||
|
|
||||||
|
Path to directory with external elements
|
||||||
|
|
||||||
.. zuul:jobvar:: extra_elements
|
.. zuul:jobvar:: extra_elements
|
||||||
:type: list
|
:type: list
|
||||||
:default: []
|
:default: []
|
||||||
|
|
|
@ -44,6 +44,9 @@ providers:
|
||||||
diskimages:
|
diskimages:
|
||||||
- name: test-image
|
- name: test-image
|
||||||
rebuild-age: 86400
|
rebuild-age: 86400
|
||||||
|
{% if 'elements-dir' in nodepool_diskimage %}
|
||||||
|
elements-dir: '{{ nodepool_diskimage.elements-dir }}'
|
||||||
|
{% endif %}
|
||||||
elements:
|
elements:
|
||||||
- {{ nodepool_diskimage.base_element }}
|
- {{ nodepool_diskimage.base_element }}
|
||||||
{% if 'extra_elements' in nodepool_diskimage %}
|
{% if 'extra_elements' in nodepool_diskimage %}
|
||||||
|
|
Loading…
Reference in New Issue