slaveOptions:
availabilityZone: {{ availability_zone }}
bootSource:
- volumeFromImage:
+ {{ image_type }}:
name: {{ image_name }}
- volumeSize: {{ volume_size }}
+{%- if image_type == "volumeFromImage" %}
+ volumeSize: {{ volume_size }}{% endif %}
fsRoot: {{ fs_root }}
hardwareId: {{ hardware_id }}
{%- if is_sandbox is defined %}
{%- if instance_cap %}
instanceCap: {{ instance_cap }}{% endif %}
{%- if num_executors %}
- numExectorts: {{ num_executors }}{% endif %}
+ numExecutors: {{ num_executors }}{% endif %}
{%- if retention_time %}
retentionTime: {{ retention_time }}
{%- else %}
value = lookuptable[value]
section_cloud[key] = value
+ if "volume_size" not in section_cloud:
+ section_cloud.update(image_type="image")
+ else:
+ section_cloud.update(image_type="volumeFromImage")
+
j2_template = Template(maintemplate)
print(j2_template.render(section_cloud))
--- /dev/null
+---
+fixes:
+ - |
+ Pin pyparsing<3.0.0 which is required by httplib2 0.20.1.
+ A new version of pip 21.3.1 is out that has removed
+ the dependency pyparsing<3,>=2.4.2 as required by httplib2.
# necessary so that future maintainers of this file can make decisions to
# remove the workarounds in the future.
importlib-resources<2.0.0 # virtualenv 20.0.21 requires importlib-resources<2.0.0 (RELENG-2993)
+pyparsing<3.0.0 # httplib2 0.20.1 requires pyparsing<3,>=2.4.2
EOF
#Python 3.5 in Ubuntu 16.04 workaround