update-template-*.sh: Remove the overriding parameter from *_cache_key_for_image_kernel functions

The cache should operate on the original location in template.

Signed-off-by: Norio Nomura <[email protected]>

Author: norio-nomura

hack/update-template-almalinux.sh

@@ -130,8 +130,8 @@ function almalinux_latest_image_entry_for_url_spec() {
 }
 
 function almalinux_cache_key_for_image_kernel() {
-	local location=$1 overriding=${3:-"{}"} url_spec
-	url_spec=$(almalinux_url_spec_from_location "${location}" | jq -r ". + ${overriding}")
+	local location=$1 url_spec
+	url_spec=$(almalinux_url_spec_from_location "${location}")
 	jq -r '["almalinux", .major_minor_version // .major_version, .target_vendor,
 		if .date then "timestamped" else "latest" end,
 		.arch, .file_extension] | join(":")' <<<"${url_spec}"
@@ -254,7 +254,7 @@ for template in "${templates[@]}"; do
 		set +e # Disable 'set -e' to avoid exiting on error for the next assignment.
 		cache_key=$(
 			set -e # Enable 'set -e' for the next command.
-			almalinux_cache_key_for_image_kernel "${location}" "${kernel_location}" "${overriding}"
+			almalinux_cache_key_for_image_kernel "${location}" "${kernel_location}"
 		) # Check exit status separately to prevent disabling 'set -e' by using the function call in the condition.
 		# shellcheck disable=2181
 		[[ $? -eq 0 ]] || continue

hack/update-template-archlinux.sh

@@ -261,7 +261,7 @@ for template in "${templates[@]}"; do
 		set +e # Disable 'set -e' to avoid exiting on error for the next assignment.
 		cache_key=$(
 			set -e # Enable 'set -e' for the next command.
-			archlinux_cache_key_for_image_kernel "${location}" "${kernel_location}" "${overriding}"
+			archlinux_cache_key_for_image_kernel "${location}" "${kernel_location}"
 		) # Check exit status separately to prevent disabling 'set -e' by using the function call in the condition.
 		# shellcheck disable=2181
 		[[ $? -eq 0 ]] || continue

hack/update-template-centos-stream.sh

@@ -20,7 +20,7 @@ Description:
   This script updates the CentOS Stream image location in the specified templates.
   If the image location in the template contains a release date in the URL, the script replaces it with the latest available date.
 
-  Image location basename format: CentOS[Stream-GenericCloud-<version>-[latest|<date>.0].<arch>.qcow2
+  Image location basename format: CentOS-Stream-GenericCloud-<version>-[latest|<date>.0].<arch>.qcow2
 
   Published CentOS Stream image information is fetched from the following URLs:
 
@@ -121,8 +121,8 @@ function centos_latest_image_entry_for_url_spec() {
 }
 
 function centos_cache_key_for_image_kernel() {
-	local location=$1 overriding=${3:-"{}"} url_spec
-	url_spec=$(centos_url_spec_from_location "${location}" | jq -r ". + ${overriding}")
+	local location=$1 url_spec
+	url_spec=$(centos_url_spec_from_location "${location}")
 	jq -r '["centos", .version, .target_vendor,
 		if .date_and_ci_job_id then "timestamped" else "latest" end,
 		.arch, .file_extension] | join(":")' <<<"${url_spec}"
@@ -241,7 +241,7 @@ for template in "${templates[@]}"; do
 		set +e # Disable 'set -e' to avoid exiting on error for the next assignment.
 		cache_key=$(
 			set -e # Enable 'set -e' for the next command.
-			centos_cache_key_for_image_kernel "${location}" "${kernel_location}" "${overriding}"
+			centos_cache_key_for_image_kernel "${location}" "${kernel_location}"
 		) # Check exit status separately to prevent disabling 'set -e' by using the function call in the condition.
 		# shellcheck disable=2181
 		[[ $? -eq 0 ]] || continue

hack/update-template-debian.sh

@@ -285,8 +285,8 @@ function debian_location_from_url_spec() {
 # debian_release_24.04-server-amd64-.img
 # ```
 function debian_cache_key_for_image_kernel_overriding() {
-	local location=$1 kernel_location=${2:-null} overriding=${3:-"{}"} url_spec with_kernel='' version backports arch daily timestamped file_extension
-	url_spec=$(debian_url_spec_from_location "${location}" | jq -r ". + ${overriding}")
+	local location=$1 kernel_location=${2:-null} url_spec with_kernel='' version backports arch daily timestamped file_extension
+	url_spec=$(debian_url_spec_from_location "${location}")
 	[[ ${kernel_location} != "null" ]] && with_kernel=_with_kernel
 	version=$(jq -r '.version|if . then "-\(.)" else empty end' <<<"${url_spec}")
 	backports=$(jq -r 'if .backports then "-backports" else empty end' <<<"${url_spec}")
@@ -407,7 +407,7 @@ for template in "${templates[@]}"; do
 		set +e # Disable 'set -e' to avoid exiting on error for the next assignment.
 		cache_key=$(
 			set -e # Enable 'set -e' for the next command.
-			debian_cache_key_for_image_kernel_overriding "${location}" "${kernel_location}" "${overriding}"
+			debian_cache_key_for_image_kernel_overriding "${location}" "${kernel_location}"
 		) # Check exit status separately to prevent disabling 'set -e' by using the function call in the condition.
 		# shellcheck disable=2181
 		[[ $? -eq 0 ]] || continue

hack/update-template-rocky.sh

@@ -145,8 +145,8 @@ function rocky_latest_image_entry_for_url_spec() {
 }
 
 function rocky_cache_key_for_image_kernel() {
-	local location=$1 overriding=${3:-"{}"} url_spec
-	url_spec=$(rocky_url_spec_from_location "${location}" | jq -r ". + ${overriding}")
+	local location=$1 url_spec
+	url_spec=$(rocky_url_spec_from_location "${location}")
 	jq -r '["rocky", .major_minor_version // .major_version, .target_vendor,
 		if .date_and_ci_job_id then "timestamped" else "latest" end,
 		.arch, .file_extension] | join(":")' <<<"${url_spec}"
@@ -269,7 +269,7 @@ for template in "${templates[@]}"; do
 		set +e # Disable 'set -e' to avoid exiting on error for the next assignment.
 		cache_key=$(
 			set -e # Enable 'set -e' for the next command.
-			rocky_cache_key_for_image_kernel "${location}" "${kernel_location}" "${overriding}"
+			rocky_cache_key_for_image_kernel "${location}" "${kernel_location}"
 		) # Check exit status separately to prevent disabling 'set -e' by using the function call in the condition.
 		# shellcheck disable=2181
 		[[ $? -eq 0 ]] || continue

hack/update-template-ubuntu.sh

@@ -302,8 +302,8 @@ function ubuntu_cache_key_for_image_kernel_flavor_version() {
 	local location=$1 kernel_location=${2:-null} url_spec with_kernel='' flavor version arch path_suffix
 	url_spec=$(ubuntu_location_url_spec "${location}")
 	[[ ${kernel_location} != "null" ]] && with_kernel=_with_kernel
-	flavor=${3:-$(ubuntu_flavor_from_location_basename "${location}")}
-	version=${4:-$(ubuntu_version_from_location_basename "${location}")}
+	flavor=$(ubuntu_flavor_from_location_basename "${location}")
+	version=$(ubuntu_version_from_location_basename "${location}")
 	arch=$(ubuntu_arch_from_location_basename "${location}")
 	path_suffix=$(ubuntu_path_suffix_from_location_basename "${location}")
 	echo "ubuntu_${url_spec}${with_kernel}_${version}-${flavor}-${arch}-${path_suffix}"
@@ -425,7 +425,7 @@ for template in "${templates[@]}"; do
 		[[ $? -eq 0 ]] || continue
 		cache_key=$(
 			set -e # Enable 'set -e' for the next command.
-			ubuntu_cache_key_for_image_kernel_flavor_version "${location}" "${kernel_location}" "${overriding_flavor}" "${overriding_version}"
+			ubuntu_cache_key_for_image_kernel_flavor_version "${location}" "${kernel_location}"
 		) # Check exit status separately to prevent disabling 'set -e' by using the function call in the condition.
 		# shellcheck disable=2181
 		[[ $? -eq 0 ]] || continue