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

Jump to bottom

[cloud images] drop jmx and tools packages #524

Merged
merged 1 commit into from
May 7, 2024
Merged

[cloud images] drop jmx and tools packages #524

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
14 changes: 4 additions & 10 deletions packer/build_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ deb_arch() {

check_deb_exists () {
BASE_DIR=$1
deb_files="$BASE_DIR/$PRODUCT-server*_$(deb_arch).deb $BASE_DIR/$PRODUCT-machine-image*_all.deb $BASE_DIR/$PRODUCT-jmx*_all.deb $BASE_DIR/$PRODUCT-tools-*_all.deb $BASE_DIR/$PRODUCT-python3*_$(deb_arch).deb"
deb_files="$BASE_DIR/$PRODUCT-server*_$(deb_arch).deb $BASE_DIR/$PRODUCT-machine-image*_all.deb $BASE_DIR/$PRODUCT-python3*_$(deb_arch).deb"
for deb in $deb_files
do
if [[ ! -f "$deb" ]]; then
Expand Down Expand Up @@ -219,8 +219,6 @@ if [ $LOCALDEB -eq 1 ]; then

SCYLLA_FULL_VERSION=$(get_version_from_local_deb "$DIR"/files/"$PRODUCT"-server*_$(deb_arch).deb)
SCYLLA_MACHINE_IMAGE_VERSION=$(get_version_from_local_deb "$DIR"/files/"$PRODUCT"-machine-image*_all.deb)
SCYLLA_JMX_VERSION=$(get_version_from_local_deb "$DIR"/files/"$PRODUCT"-jmx*_all.deb)
SCYLLA_TOOLS_VERSION=$(get_version_from_local_deb "$DIR"/files/"$PRODUCT"-tools-*_all.deb)
SCYLLA_PYTHON3_VERSION=$(get_version_from_local_deb "$DIR"/files/"$PRODUCT"-python3*_$(deb_arch).deb)

cd "$DIR"/files
Expand All @@ -236,7 +234,7 @@ elif [ $DOWNLOAD_ONLY -eq 1 ]; then
import_gpg_key

cd "$DIR"/files
apt-get download --allow-unauthenticated "$PRODUCT" "$PRODUCT"-machine-image "$PRODUCT"-jmx "$PRODUCT"-tools-core "$PRODUCT"-tools "$PRODUCT"-python3
apt-get download --allow-unauthenticated "$PRODUCT" "$PRODUCT"-machine-image "$PRODUCT"-python3
sudo rm -f $TMPREPO
exit 0
else
Expand All @@ -250,8 +248,6 @@ else

SCYLLA_FULL_VERSION=$(get_version_from_remote_deb $PRODUCT-server)
SCYLLA_MACHINE_IMAGE_VERSION=$(get_version_from_remote_deb $PRODUCT-machine-image)
SCYLLA_JMX_VERSION=$(get_version_from_remote_deb $PRODUCT-jmx)
SCYLLA_TOOLS_VERSION=$(get_version_from_remote_deb $PRODUCT-tools)
SCYLLA_PYTHON3_VERSION=$(get_version_from_remote_deb $PRODUCT-python3)

sudo rm -f $TMPREPO
Expand Down Expand Up @@ -283,7 +279,7 @@ if [ "$TARGET" = "aws" ]; then
exit 1
esac

SCYLLA_AMI_DESCRIPTION="scylla-$SCYLLA_FULL_VERSION scylla-machine-image-$SCYLLA_MACHINE_IMAGE_VERSION scylla-jmx-$SCYLLA_JMX_VERSION scylla-tools-$SCYLLA_TOOLS_VERSION scylla-python3-$SCYLLA_PYTHON3_VERSION"
SCYLLA_AMI_DESCRIPTION="scylla-$SCYLLA_FULL_VERSION scylla-machine-image-$SCYLLA_MACHINE_IMAGE_VERSION scylla-python3-$SCYLLA_PYTHON3_VERSION"

PACKER_ARGS+=(-var region="$REGION")
PACKER_ARGS+=(-var buildMode="$BUILD_MODE")
Expand All @@ -299,7 +295,7 @@ elif [ "$TARGET" = "gce" ]; then
elif [ "$TARGET" = "azure" ]; then
REGION="EAST US"
SSH_USERNAME=azureuser
SCYLLA_IMAGE_DESCRIPTION="scylla-$SCYLLA_FULL_VERSION scylla-machine-image-$SCYLLA_MACHINE_IMAGE_VERSION scylla-jmx-$SCYLLA_JMX_VERSION scylla-tools-$SCYLLA_TOOLS_VERSION scylla-python3-$SCYLLA_PYTHON3_VERSION"
SCYLLA_IMAGE_DESCRIPTION="scylla-$SCYLLA_FULL_VERSION scylla-machine-image-$SCYLLA_MACHINE_IMAGE_VERSION scylla-python3-$SCYLLA_PYTHON3_VERSION"

PACKER_ARGS+=(-var scylla_image_description="${SCYLLA_IMAGE_DESCRIPTION:0:255}")
PACKER_ARGS+=(-var client_id="$AZURE_CLIENT_ID")
Expand Down Expand Up @@ -344,8 +340,6 @@ set -x
-var scylla_full_version="$SCYLLA_FULL_VERSION" \
-var scylla_version="$VERSION" \
-var scylla_machine_image_version="$SCYLLA_MACHINE_IMAGE_VERSION" \
-var scylla_jmx_version="$SCYLLA_JMX_VERSION" \
-var scylla_tools_version="$SCYLLA_TOOLS_VERSION" \
-var scylla_python3_version="$SCYLLA_PYTHON3_VERSION" \
-var creation_timestamp="$CREATION_TIMESTAMP" \
-var scylla_build_sha_id="$SCYLLA_BUILD_SHA_ID" \
Expand Down
6 changes: 0 additions & 6 deletions packer/scylla.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@
"Name": "{{user `image_name`| clean_resource_name}}",
"scylla_version": "{{user `scylla_full_version`}}",
"scylla_machine_image_version": "{{user `scylla_machine_image_version`}}",
"scylla_jmx_version": "{{user `scylla_jmx_version`}}",
"scylla_tools_version": "{{user `scylla_tools_version`}}",
"scylla_python3_version": "{{user `scylla_python3_version`}}",
"user_data_format_version": "3",
"creation_timestamp": "{{user `creation_timestamp`| clean_resource_name}}",
Expand Down Expand Up @@ -122,8 +120,6 @@
"image_labels": {
"scylla_version": "{{user `scylla_full_version`| clean_resource_name}}",
"scylla_machine_image_version": "{{user `scylla_machine_image_version`| clean_resource_name}}",
"scylla_jmx_version": "{{user `scylla_jmx_version`| clean_resource_name}}",
"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",
"creation_timestamp": "{{user `creation_timestamp`| clean_resource_name}}",
Expand Down Expand Up @@ -158,8 +154,6 @@
"azure_tags": {
"scylla_version": "{{user `scylla_full_version`}}",
"scylla_machine_image_version": "{{user `scylla_machine_image_version`}}",
"scylla_jmx_version": "{{user `scylla_jmx_version`}}",
"scylla_tools_version": "{{user `scylla_tools_version`}}",
"scylla_python3_version": "{{user `scylla_python3_version`}}",
"user_data_format_version": "3",
"creation_timestamp": "{{user `creation_timestamp`| clean_resource_name}}",
Expand Down
Loading