From be47a116b07acf1aee6b894c0c843f42a94fb1f1 Mon Sep 17 00:00:00 2001 From: Beni Peled Date: Mon, 13 May 2024 09:35:05 +0300 Subject: [PATCH] Remove unused flag ami-users Following https://github.com/scylladb/scylla-pkg/pull/4002 the ami-users flag is no longer in use --- packer/build_image.sh | 7 ------- packer/scylla.json | 1 - 2 files changed, 8 deletions(-) diff --git a/packer/build_image.sh b/packer/build_image.sh index 0b809d6c4..249e56855 100755 --- a/packer/build_image.sh +++ b/packer/build_image.sh @@ -28,7 +28,6 @@ print_usage() { 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)" - echo " [--ami-users] A list of account IDs that have access to launch the AMI" echo " [--build-tag] Jenkins Build tag" echo " --download-no-server Download all deb needed excluding scylla from repo-for-install" echo " [--build-mode] Choose which build mode to use for Scylla installation. Default: release. Valid options: release|debug" @@ -94,11 +93,6 @@ while [ $# -gt 0 ]; do echo "--ami-regions parameter: AMI_REGIONS |$AMI_REGIONS|" shift 2 ;; - "--ami-users"): - AMI_USERS=$2 - echo "--ami-users parameter: AMI_USERS |$AMI_USERS|" - shift 2 - ;; "--log-file") PACKER_LOG_PATH=$2 echo "--log-file parameter: PACKER_LOG_PATH |$PACKER_LOG_PATH|" @@ -347,7 +341,6 @@ set -x -var operating_system="$OPERATING_SYSTEM" \ -var branch="$BRANCH" \ -var ami_regions="$AMI_REGIONS" \ - -var ami_users="$AMI_USERS" \ -var arch="$ARCH" \ -var product="$PRODUCT" \ -var build_mode="$BUILD_MODE" \ diff --git a/packer/scylla.json b/packer/scylla.json index ef934db2d..e3b88a53f 100644 --- a/packer/scylla.json +++ b/packer/scylla.json @@ -88,7 +88,6 @@ "build_mode": "{{user `build_mode`| clean_resource_name}}" }, "ami_regions": "{{user `ami_regions`}}", - "ami_users": "{{user `ami_users`}}", "aws_polling": { "delay_seconds": "30", "max_attempts": "100"