Skip to content
Snippets Groups Projects
Commit 063daa1a authored by Eesaan Atluri's avatar Eesaan Atluri
Browse files

Merge branch 'feat-build-date-iso8601' into 'master'

Change build date to iso8601 format

Closes #6

See merge request rc/terraform-openstack!24
parents 6c147c23 e9898d4e
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,7 @@ prep-deploy: ...@@ -31,7 +31,7 @@ prep-deploy:
environment: environment:
name: $TARGET_ENV name: $TARGET_ENV
script: script:
- export BUILD_DATE=$(TZ=America/Chicago date +%Y-%m-%d-%H-%M-%S) - export BUILD_DATE=$(TZ=America/Chicago date +%Y-%m-%dT%H%M%S)
- | - |
if [ "$TARGET_ENV" = "dev" ]; then if [ "$TARGET_ENV" = "dev" ]; then
TF_VAR_data_volume="xdmod-dev-volume-$BUILD_DATE" TF_VAR_data_volume="xdmod-dev-volume-$BUILD_DATE"
...@@ -77,9 +77,8 @@ tf-apply: ...@@ -77,9 +77,8 @@ tf-apply:
script: script:
- echo "TF_VAR_data_volume=${TF_VAR_data_volume}" - echo "TF_VAR_data_volume=${TF_VAR_data_volume}"
- echo "TF_VAR_flavor=${TF_VAR_flavor}" - echo "TF_VAR_flavor=${TF_VAR_flavor}"
- export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d%H%M%S)
- export TF_VAR_internal_network="xdmod-packer-clusternet-$BUILD_DATE" - export TF_VAR_internal_network="xdmod-packer-clusternet-$BUILD_DATE"
- | - |
if [ -z $TF_VAR_image_ohpc ]; if [ -z $TF_VAR_image_ohpc ];
then then
XDMOD_IMAGES=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID | grep -P " xdmod-${TARGET_ENV}-\d{14}$" | awk '{print $2}')) XDMOD_IMAGES=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID | grep -P " xdmod-${TARGET_ENV}-\d{14}$" | awk '{print $2}'))
...@@ -87,7 +86,7 @@ tf-apply: ...@@ -87,7 +86,7 @@ tf-apply:
echo $TF_VAR_image_ohpc echo $TF_VAR_image_ohpc
else else
echo "image_ohpc defined as ${TF_VAR_image_ohpc}" echo "image_ohpc defined as ${TF_VAR_image_ohpc}"
fi fi
- export TF_VAR_keypair_name="os-gen-keypair-$BUILD_DATE" - export TF_VAR_keypair_name="os-gen-keypair-$BUILD_DATE"
- | - |
terraform apply -auto-approve terraform apply -auto-approve
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment