Skip to content

Prefix BK metadata with fips indicator #9056

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

Merged
merged 10 commits into from
Jul 25, 2025
Merged

Prefix BK metadata with fips indicator #9056

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
556329a
Associate ESS metadata with job ids
michel-laterman Jul 17, 2025
cfb28f4
Echo job ids
michel-laterman Jul 17, 2025
b43a376
Add --job in powershell scripts
michel-laterman Jul 21, 2025
9523561
Correct JOB_ID assignment
michel-laterman Jul 22, 2025
e7e28d7
Review feedback
michel-laterman Jul 23, 2025
b99e4b3
use plugin for fips deployment upgrade test
michel-laterman Jul 23, 2025
2c99659
Apply suggestions from code review
michel-laterman Jul 24, 2025
3005695
Cleanup ess.ps1
michel-laterman Jul 24, 2025
50a28ca
Fix script
michel-laterman Jul 24, 2025
07d92a9
Add FIPS: true to bk fips stack provisioning
michel-laterman Jul 24, 2025
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
22 changes: 15 additions & 7 deletions .buildkite/scripts/steps/ess_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,18 @@ ess_up $OVERRIDE_STACK_VERSION
preinstall_fleet_packages

echo "ES_HOST: ${ELASTICSEARCH_HOST}"
buildkite-agent meta-data set "es.host" $ELASTICSEARCH_HOST
buildkite-agent meta-data set "es.username" $ELASTICSEARCH_USERNAME
buildkite-agent meta-data set "es.pwd" $ELASTICSEARCH_PASSWORD
buildkite-agent meta-data set "kibana.host" $KIBANA_HOST
buildkite-agent meta-data set "kibana.username" $KIBANA_USERNAME
buildkite-agent meta-data set "kibana.pwd" $KIBANA_PASSWORD
buildkite-agent meta-data set "integrations_server.host" $INTEGRATIONS_SERVER_HOST
echo "BUILDKITE_JOB_ID: ${BUILDKITE_JOB_ID}"

if [[ $BUILDKITE_STEP_KEY == "integration-fips-ess" ]]; then
buildkite-agent meta-data set "ess.job.fips" ${BUILDKITE_JOB_ID}
else
buildkite-agent meta-data set "ess.job" ${BUILDKITE_JOB_ID}
fi

buildkite-agent meta-data set "es.host" $ELASTICSEARCH_HOST --job ${BUILDKITE_JOB_ID}
buildkite-agent meta-data set "es.username" $ELASTICSEARCH_USERNAME --job ${BUILDKITE_JOB_ID}
buildkite-agent meta-data set "es.pwd" $ELASTICSEARCH_PASSWORD --job ${BUILDKITE_JOB_ID}
buildkite-agent meta-data set "kibana.host" $KIBANA_HOST --job ${BUILDKITE_JOB_ID}
buildkite-agent meta-data set "kibana.username" $KIBANA_USERNAME --job ${BUILDKITE_JOB_ID}
buildkite-agent meta-data set "kibana.pwd" $KIBANA_PASSWORD --job ${BUILDKITE_JOB_ID}
buildkite-agent meta-data set "integrations_server.host" $INTEGRATIONS_SERVER_HOST --job ${BUILDKITE_JOB_ID}
20 changes: 13 additions & 7 deletions .buildkite/scripts/steps/integration_tests_tf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@ if [[ "${BUILDKITE_RETRY_COUNT}" -gt 0 || "${FORCE_ESS_CREATE:-false}" == "true"
else
# For the first run, we start the stack in the start_ess.sh step and it sets the meta-data
echo "~~~ Receiving ESS stack metadata"
export ELASTICSEARCH_HOST=$(buildkite-agent meta-data get "es.host")
export ELASTICSEARCH_USERNAME=$(buildkite-agent meta-data get "es.username")
export ELASTICSEARCH_PASSWORD=$(buildkite-agent meta-data get "es.pwd")
export KIBANA_HOST=$(buildkite-agent meta-data get "kibana.host")
export KIBANA_USERNAME=$(buildkite-agent meta-data get "kibana.username")
export KIBANA_PASSWORD=$(buildkite-agent meta-data get "kibana.pwd")
export INTEGRATIONS_SERVER_HOST=$(buildkite-agent meta-data get "integrations_server.host")
if [[ $BUILDKITE_STEP_KEY == "integration-fips-ess" ]]; then
JOB_ID=$(buildkite-agent meta-data get "ess.job.fips")
else
JOB_ID=$(buildkite-agent meta-data get "ess.job")
fi
echo "Using JOB_ID: ${JOB_ID}"
export ELASTICSEARCH_HOST=$(buildkite-agent meta-data get "es.host" --job ${JOB_ID})
export ELASTICSEARCH_USERNAME=$(buildkite-agent meta-data get "es.username" --job ${JOB_ID})
export ELASTICSEARCH_PASSWORD=$(buildkite-agent meta-data get "es.pwd" --job ${JOB_ID})
export KIBANA_HOST=$(buildkite-agent meta-data get "kibana.host" --job ${JOB_ID})
export KIBANA_USERNAME=$(buildkite-agent meta-data get "kibana.username" --job ${JOB_ID})
export KIBANA_PASSWORD=$(buildkite-agent meta-data get "kibana.pwd" --job ${JOB_ID})
export INTEGRATIONS_SERVER_HOST=$(buildkite-agent meta-data get "integrations_server.host" --job ${JOB_ID})
fi

# Run integration tests
Expand Down
Loading