From c24c138cc101a297c1617d574454c7defdfacf14 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Fri, 14 Mar 2025 20:30:31 -0500
Subject: [PATCH] refactor: remove unused condition
We do not run merge request pipeline, so no need to check for it
---
.gitlab-ci.yml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 372147a..9a6a693 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -186,6 +186,7 @@ build_ood_image:
- export PKR_VAR_flavor="${OOD_BUILD_FLAVOR:-$PKR_VAR_flavor}"
- export PKR_VAR_build_instance_name="${BUILD_TARGET}-${EXT_REPO_HEAD}"
- export PKR_VAR_image_date_suffix=false
+ - export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
- |
if [ $ENV = 'knightly' || $ENV = 'prod' ]; then
curl --header "PRIVATE-TOKEN: ${ANSIBLE_VAR_TOKEN}" \
@@ -196,11 +197,6 @@ build_ood_image:
'sed -i -E "s/(user_register_app_key: ).*/\1\"${SELF_REG_APP_KEY}\"/" CRI_XCBC/group_vars/$ENV'
'sed -i -E "s/(celery_user_password: ).*/\1\"${CELERY_PASSWD}\"/" CRI_XCBC/group_vars/$ENV'
'sed -i -E "s|(ssh_pub_key: ).*|\1\"{{ lookup(''file'', ''${SSH_PUB_KEY}'') }}\"|" CRI_XCBC/group_vars/$ENV'
- - |
- if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
- export PKR_VAR_image_name="ood-PR-${CI_MERGE_REQUEST_IID}"
- elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
- export PKR_VAR_image_name="ood-${BUILD_DATE}"
fi
# packer commands
- packer init openstack-ood
--
GitLab