Commit 0f69d578 by Brian Beggs

Reduce SHA1s tagged on images to 7 characters. TE-1717

parent 2449a29b
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
- name: Create AMI - name: Create AMI
ec2_ami_2_0_0_1: ec2_ami_2_0_0_1:
instance_id: "{{ instance_id }}" instance_id: "{{ instance_id }}"
name: "{{ edx_environment }} -- {{ deployment }} -- {{ play }} -- {{ app_version }} -- {{ extra_name_identifier }}" name: "{{ edx_environment }} -- {{ deployment }} -- {{ play }} -- {{ app_version[:7] }} -- {{ extra_name_identifier }}"
region: "{{ ec2_region }}" region: "{{ ec2_region }}"
wait: "{{ ami_wait }}" wait: "{{ ami_wait }}"
wait_timeout: "{{ ami_creation_timeout }}" wait_timeout: "{{ ami_creation_timeout }}"
...@@ -73,9 +73,9 @@ ...@@ -73,9 +73,9 @@
description: "AMI built via edX continuous delivery pipeline - Ansible version: {{ ansible_version }}" description: "AMI built via edX continuous delivery pipeline - Ansible version: {{ ansible_version }}"
# used a JSON object here as there is a string interpolation in the keys. # used a JSON object here as there is a string interpolation in the keys.
tags: "{ tags: "{
'version:{{ play }}':'{{ app_repo }} {{ app_version }}', 'version:{{ play }}':'{{ app_repo }} {{ app_version[:7] }}',
'version:configuration':'{{ configuration_repo }} {{ configuration_version }}', 'version:configuration':'{{ configuration_repo }} {{ configuration_version[:7] }}',
'version:configuration_secure':'{{ configuration_secure_repo }} {{ configuration_secure_version }}', 'version:configuration_secure':'{{ configuration_secure_repo }} {{ configuration_secure_version[:7] }}',
'play':'{{ play }}', 'play':'{{ play }}',
'cache_id':'{{ cache_id }}', 'cache_id':'{{ cache_id }}',
'environment':'{{ edx_environment }}', 'environment':'{{ edx_environment }}',
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
region: "{{ ec2_region }}" region: "{{ ec2_region }}"
resource: "{{ ami_register.image_id }}" resource: "{{ ami_register.image_id }}"
tags: tags:
version:edxapp_theme: "{{ edx_app_theme_repo }} {{ edx_app_theme_version }}" version:edxapp_theme: "{{ edx_app_theme_repo }} {{ edx_app_theme_version[:7] }}"
when: edx_app_theme_version is defined and edx_app_theme_repo is defined when: edx_app_theme_version is defined and edx_app_theme_repo is defined
- name: Ensure artifact directory exists - name: Ensure artifact directory exists
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment