Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cloud images] rename build_id to creation_timestamp tag #523

Merged
merged 1 commit into from
May 7, 2024
Merged

[cloud images] rename build_id to creation_timestamp tag #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions packer/build_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
DIR=$(dirname $(readlink -f "$0"))
source "$DIR"/../SCYLLA-VERSION-GEN

BUILD_ID=$(date -u '+%FT%H-%M-%S')
CREATION_TIMESTAMP=$(date -u '+%FT%H-%M-%S')
OPERATING_SYSTEM="ubuntu22.04"
EXIT_STATUS=0
DRY_RUN=false
Expand All @@ -25,7 +25,6 @@ print_usage() {
echo " --repo-for-update Repository for update, specify .repo/.list file URL"
echo " [--product] scylla or scylla-enterprise, default from SCYLLA-PRODUCT-FILE"
echo " [--dry-run] Validate template only (image is not built). Default: false"
echo " [--build-id] Set unique build ID, will be part of GCE image name and as a label. Default: Date."
echo " [--scylla-build-sha-id] Scylla build SHA id form metadata file"
echo " [--branch] Set the release branch for GCE label. Default: master"
echo " [--ami-regions] Set regions to copy the AMI when done building it (including permissions and tags)"
Expand Down Expand Up @@ -75,14 +74,9 @@ while [ $# -gt 0 ]; do
echo "--product parameter: PRODUCT |$PRODUCT|"
shift 2
;;
"--build-id")
BUILD_ID=$2
echo "--build-id parameter: BUILD_ID |$BUILD_ID|"
shift 2
;;
"--scylla-build-sha-id")
SCYLLA_BUILD_SHA_ID=$2
echo "--build-id parameter: SCYLLA_BUILD_SHA_ID |$SCYLLA_BUILD_SHA_ID|"
echo "--scylla-build-sha-id parameter: SCYLLA_BUILD_SHA_ID |$SCYLLA_BUILD_SHA_ID|"
shift 2
;;
"--build-tag")
Expand Down Expand Up @@ -353,7 +347,7 @@ set -x
-var scylla_jmx_version="$SCYLLA_JMX_VERSION" \
-var scylla_tools_version="$SCYLLA_TOOLS_VERSION" \
-var scylla_python3_version="$SCYLLA_PYTHON3_VERSION" \
-var scylla_build_id="$BUILD_ID" \
-var creation_timestamp="$CREATION_TIMESTAMP" \
-var scylla_build_sha_id="$SCYLLA_BUILD_SHA_ID" \
-var build_tag="$BUILD_TAG" \
-var operating_system="$OPERATING_SYSTEM" \
Expand Down
6 changes: 3 additions & 3 deletions packer/scylla.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"scylla_tools_version": "{{user `scylla_tools_version`}}",
"scylla_python3_version": "{{user `scylla_python3_version`}}",
"user_data_format_version": "3",
"build_id": "{{user `scylla_build_id`| clean_resource_name}}",
"creation_timestamp": "{{user `creation_timestamp`| clean_resource_name}}",
"branch": "{{user `branch`| clean_resource_name}}",
"operating_system": "{{user `operating_system`| clean_resource_name}}",
"scylla_build_sha_id": "{{user `scylla_build_sha_id`| clean_resource_name}}",
Expand Down Expand Up @@ -126,7 +126,7 @@
"scylla_tools_version": "{{user `scylla_tools_version`| clean_resource_name}}",
"scylla_python3_version": "{{user `scylla_python3_version`| clean_resource_name}}",
"user_data_format_version": "3",
"build_id": "{{user `scylla_build_id`| clean_resource_name}}",
"creation_timestamp": "{{user `creation_timestamp`| clean_resource_name}}",
"branch": "{{user `branch`| clean_resource_name}}",
"operating_system": "{{user `operating_system`| clean_resource_name}}",
"scylla_build_sha_id": "{{user `scylla_build_sha_id`| clean_resource_name}}",
Expand Down Expand Up @@ -162,7 +162,7 @@
"scylla_tools_version": "{{user `scylla_tools_version`}}",
"scylla_python3_version": "{{user `scylla_python3_version`}}",
"user_data_format_version": "3",
"build_id": "{{user `scylla_build_id`| clean_resource_name}}",
"creation_timestamp": "{{user `creation_timestamp`| clean_resource_name}}",
"branch": "{{user `branch`| clean_resource_name}}",
"operating_system": "{{user `operating_system`| clean_resource_name}}",
"scylla_build_sha_id": "{{user `scylla_build_sha_id`| clean_resource_name}}",
Expand Down
Loading