Code review refactor

Rename INCLUDE_SHA to INCLUDE_COMMIT_ID in qualified-version script.
Confine use of this argument to individual invocations instead at top level in scripts.

Author: donoghuc

Diff for: .buildkite/scripts/common/qualified-version.sh

@@ -18,7 +18,7 @@ export QUALIFIED_VERSION="$(
   printf '%s' "${VERSION_QUALIFIER:+-${VERSION_QUALIFIER}}"
 
   # Include git SHA if requested
-  if [[ -n "${INCLUDE_SHA:+x}" ]]; then
+  if [[ -n "${INCLUDE_COMMIT_ID:+x}" ]]; then
     printf '%s' "-$(git rev-parse --short HEAD)"
   fi
 

Diff for: .buildkite/scripts/dra/build-and-push-observability-sre.sh

@@ -17,12 +17,10 @@ echo "Pushing ObservabilitySRE container to Docker repository"
 docker_login
 
 # Get qualified version without SHA (this is what the gradle task will produce)
-export INCLUDE_SHA=""
 QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
 
 # Set environment variable to include SHA and get version with SHA
-export INCLUDE_SHA=1
-QUALIFIED_VERSION_WITH_SHA="$(.buildkite/scripts/common/qualified-version.sh)"
+QUALIFIED_VERSION_WITH_SHA="$(INCLUDE_COMMIT_ID=1 .buildkite/scripts/common/qualified-version.sh)"
 
 REGISTRY_PATH=docker.elastic.co/logstash/logstash-observability-sre
 

Diff for: .buildkite/scripts/dra/multi-architecture-observability-sre.sh

@@ -7,9 +7,8 @@ source .buildkite/scripts/dra/docker-env-setup.sh
 
 docker_login
 
-# Set INCLUDE_SHA to include git SHA in version
-export INCLUDE_SHA=1
-QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
+# Set INCLUDE_COMMIT_ID to include git SHA in version
+QUALIFIED_VERSION="$(INCLUDE_COMMIT_ID=1 .buildkite/scripts/common/qualified-version.sh)"
 REGISTRY_PATH=docker.elastic.co/logstash/logstash-observability-sre
 
 # Architecture-specific tags (created by the build steps)
@@ -35,7 +34,6 @@ echo "Pushing manifest: ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG}"
 docker manifest push ${REGISTRY_PATH}:${VERSION_MANIFEST_TAG}
 
 # Also create version without SHA for effective "latest" tag
-export INCLUDE_SHA=""
 BASE_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
 echo "Creating manifest list for: ${REGISTRY_PATH}:${BASE_VERSION}"
 docker manifest create ${REGISTRY_PATH}:${BASE_VERSION} \