From 242d046fedc4fa8d0629d11018db7e0401209947 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Thu, 7 Sep 2023 15:36:19 -0500
Subject: [PATCH 1/4] Use ISO8601 for Build date
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dad551..cd33d6f 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 --iso-8601=seconds)
- |
if [ "$TARGET_ENV" = "dev" ]; then
TF_VAR_data_volume="xdmod-dev-volume-$BUILD_DATE"
--
GitLab
From fad9571c26d9a140df6544604f5a259f4e594301 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Thu, 7 Sep 2023 15:36:52 -0500
Subject: [PATCH 2/4] Build date already defined in pre stage
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd33d6f..a81998e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,6 @@ 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 ];
--
GitLab
From 49968acccde5edd3a9f2255b77efde433609a54c Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Thu, 7 Sep 2023 15:37:31 -0500
Subject: [PATCH 3/4] Remove trailing whitespace
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a81998e..a42286c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ tf-apply:
- echo "TF_VAR_data_volume=${TF_VAR_data_volume}"
- echo "TF_VAR_flavor=${TF_VAR_flavor}"
- 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}'))
@@ -88,7 +88,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
From 69ac89d08c0467c436eddb0aea21fbec1fdf0cf7 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Wed, 13 Sep 2023 15:35:15 -0500
Subject: [PATCH 4/4] Remove colon and timezone from timestamp
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a42286c..4a7c9d0 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 --iso-8601=seconds)
+ - 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"
--
GitLab