added tag definition

elastic · Feb 6, 2024 · c295c5b · c295c5b
1 parent 216804b
commit c295c5b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 21 deletions.
diff --git a/.buildkite/env-scripts/macos-env.sh b/.buildkite/env-scripts/macos-env.sh
diff --git a/.buildkite/env-scripts/util.sh b/.buildkite/env-scripts/util.sh
@@ -98,3 +98,11 @@ changeset_applies() {
     echo false
   fi
 }
+
+is_pr() {
+  if [[ $BUILDKITE_PULL_REQUEST != false ]]; then
+    echo true
+  else
+    echo false
+  fi
+}
diff --git a/.buildkite/filebeat/scripts/packaging/package.sh b/.buildkite/filebeat/scripts/packaging/package.sh
@@ -2,28 +2,34 @@
 
 set -euo pipefail
 
+source .buildkite/env-scripts/linux-env.sh
+source .buildkite/env-scripts/util.sh
+TAGS=()
+
 echo ":: Start Packaging ::"
 mage -d filebeat package
 
 calculate_tags() {
-  if [ "$snapshot" = true ]; then
+  if [ "$SNAPSHOT" = true ]; then
     aliasVersion="${VERSION%.*}${IMG_POSTFIX}"
-    sourceTag+=${IMG_POSTFIX}
+    sourceTag+="${VERSION}${IMG_POSTFIX}"
   fi
 
-  local tags="${BUILDKITE_COMMIT}"
+ local tag=""
+  for tag in "${TAGS[@]}"; do
+    echo "THIS IS TAG: $tag"
+  done
 
-#  if isPR; then
-#    tags+=("pr-${CHANGE_ID}")
+#  if isPr()
+#  [env.GIT_BASE_COMMIT, pr-${env.CHANGE_ID}]
 #  else
-#    tags+=("${sourceTag}")
-#  fi
-#
-#  if ! isPR && [ -n "$(aliasVersion)" ]; then
-#    tags+=("${aliasVersion}")
-#  fi
-#
-#  echo "${tags[@]}"
+#  [env.GIT_BASE_COMMIT, sourceTag, aliasVersion]
+
+  if is_pr; then
+    TAGS+=("${BUILDKITE_COMMIT}" "pr-${GITHUB_PR_NUMBER}")
+  else
+    TAGS+=("${BUILDKITE_COMMIT}" "${sourceTag}" "${aliasVersion}")
+  fi
 }
 
 #buildkite-agent annotate "Tag '$TAG' has been created." --style 'success' --context 'ctx-success'
@@ -34,3 +40,5 @@ calculate_tags() {
 #}
 #
 #set_git_config
+
+calculate_tags
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -6,6 +6,9 @@ DOCKER_REGISTRY_SECRET_PATH="kv/ci-shared/platform-ingest/docker_registry_prod"
 PRIVATE_CI_GCS_CREDENTIALS_PATH="kv/ci-shared/platform-ingest/private_ci_artifacts_gcs_credentials"
 GITHUB_TOKEN_VAULT_PATH="kv/ci-shared/platform-ingest/github_token"
 
+# Secrets must be redacted
+# https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
+
 if [[ "$BUILDKITE_PIPELINE_SLUG" == "filebeat" || "$BUILDKITE_PIPELINE_SLUG" == "auditbeat" ]]; then
   source .buildkite/env-scripts/env.sh
   source .buildkite/env-scripts/win-env.sh