Skip to content
Snippets Groups Projects

Use BUILD_TAG if set, else fallback to BUILD_DATE

+ 4
4
@@ -20,7 +20,7 @@ variables:
@@ -20,7 +20,7 @@ variables:
PKR_VAR_security_groups: '["allow-ssh"]'
PKR_VAR_security_groups: '["allow-ssh"]'
PKR_VAR_skip_create_image: "false"
PKR_VAR_skip_create_image: "false"
PKR_VAR_ssh_username: "centos"
PKR_VAR_ssh_username: "centos"
PKR_VAR_networks: '["8cf2f12e-905d-46d9-bc70-b0897c65f75a"]'
PKR_VAR_networks: '["fc3f7d97-0171-4b3f-947e-10e0f54c4e1f"]'
GIT_AUTHOR_NAME: "Gitlab runner"
GIT_AUTHOR_NAME: "Gitlab runner"
GIT_AUTHOR_EMAIL: "gitlab@runner"
GIT_AUTHOR_EMAIL: "gitlab@runner"
INSTANCE_FLAVOR: "m1.medium-ruffner"
INSTANCE_FLAVOR: "m1.medium-ruffner"
@@ -85,7 +85,7 @@ workflow:
@@ -85,7 +85,7 @@ workflow:
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}"
export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}"
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
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
fi
# Ansible var overrides
# Ansible var overrides
- |
- |
@@ -148,7 +148,7 @@ build_ssh_proxy_image:
@@ -148,7 +148,7 @@ build_ssh_proxy_image:
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}"
export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}"
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
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
fi
# packer commands
# packer commands
- packer init openstack-login
- packer init openstack-login
@@ -186,7 +186,7 @@ build_ood_image:
@@ -186,7 +186,7 @@ build_ood_image:
- export PKR_VAR_flavor="${OOD_BUILD_FLAVOR:-$PKR_VAR_flavor}"
- export PKR_VAR_flavor="${OOD_BUILD_FLAVOR:-$PKR_VAR_flavor}"
- export PKR_VAR_build_instance_name="${BUILD_TARGET}-${EXT_REPO_HEAD}"
- export PKR_VAR_build_instance_name="${BUILD_TARGET}-${EXT_REPO_HEAD}"
- export PKR_VAR_image_date_suffix=false
- export PKR_VAR_image_date_suffix=false
- export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
- export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_TAG:-${BUILD_DATE}}"
- |
- |
if [ $ENV = 'knightly' ] || [ $ENV = 'prod' ]; then
if [ $ENV = 'knightly' ] || [ $ENV = 'prod' ]; then
curl --header "PRIVATE-TOKEN: ${ANSIBLE_VAR_TOKEN}" \
curl --header "PRIVATE-TOKEN: ${ANSIBLE_VAR_TOKEN}" \
Loading