From e9898d4e9f786b25f6e5d7ccf7852f4233d6cb5e Mon Sep 17 00:00:00 2001 From: Bo-Chun Chen <louistw@uab.edu> Date: Fri, 22 Sep 2023 10:45:24 -0500 Subject: [PATCH] Change build date to iso8601 format --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97c639a..6c4d55d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ prep-deploy: environment: name: $TARGET_ENV 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 TF_VAR_data_volume="xdmod-dev-volume-$BUILD_DATE" @@ -77,9 +77,8 @@ tf-apply: script: - echo "TF_VAR_data_volume=${TF_VAR_data_volume}" - 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" - - | + - | if [ -z $TF_VAR_image_ohpc ]; 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}')) @@ -87,7 +86,7 @@ tf-apply: echo $TF_VAR_image_ohpc else echo "image_ohpc defined as ${TF_VAR_image_ohpc}" - fi + fi - export TF_VAR_keypair_name="os-gen-keypair-$BUILD_DATE" - | terraform apply -auto-approve -- GitLab