Use BUILD_TAG if set, else fallback to BUILD_DATE

Closes #222 (closed)

.gitlab-ci.yml

@@ -37,7 +37,7 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == "schedule"
 
 .get_build_date: &get_build_date
-  - export BUILD_DATE=${BUILD_TAG:-$(TZ=America/Chicago date +%Y-%m-%dT%H%M%S)}
+  - export BUILD_DATE=$(TZ=America/Chicago date +%Y-%m-%dT%H%M%S)
   - echo BUILD_DATE=${BUILD_DATE}
 
 .update_ansible_repo: &update_ansible_repo
@@ -85,7 +85,7 @@ workflow:
       if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
         export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}"
       elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
-        export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
+        export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_TAG:-${BUILD_DATE}}"
       fi
     # Ansible var overrides
     - |
@@ -148,7 +148,7 @@ build_ssh_proxy_image:
       if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
         export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}"
       elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
-        export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
+        export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_TAG:-${BUILD_DATE}}"
       fi
     # packer commands
     - packer init openstack-login