豆豆友情提示:这是一个非官方 GitHub 代理镜像,主要用于网络测试或访问加速。请勿在此进行登录、注册或处理任何敏感信息。进行这些操作请务必访问官方网站 github.com。 Raw 内容也通过此代理提供。
Skip to content

Commit 099bd2f

Browse files
committed
make security_detection_engine.sh running in the repo root path
1 parent 80e8f1b commit 099bd2f

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.buildkite/scripts/packages/security_detection_engine.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ACTIVE_KIBANA_VERSIONS=$(curl -sL https://github.com/raw-content/elastic/kiba
1111
echo "Active Kibana versions: $ACTIVE_KIBANA_VERSIONS"
1212

1313
# Extract version spec from the manifest
14-
KIBANA_REQ=$(yq .conditions.kibana.version ./security_detection_engine/manifest.yml)
14+
KIBANA_REQ=$(yq .conditions.kibana.version ./packages/security_detection_engine/manifest.yml)
1515
echo "Kibana requirement from the security_detection_engine manifest: $KIBANA_REQ"
1616

1717
# Dump a trivial Go program to filter by semver constrains

.buildkite/scripts/test_one_package.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,23 @@ with_kubernetes
2525

2626
use_elastic_package
2727

28-
custom_package_checker_script_path="${SCRIPTS_BUILDKITE_PATH}/packages/${package}.sh"
29-
3028
pushd packages > /dev/null
3129
exit_code=0
3230
if ! process_package "${package}" ; then
3331
# keep this message as a collapsed group in Buildkite, so it
3432
# is not hidden by the previous collapsed group.
3533
echo "--- [${package}] failed"
3634
exit_code=1
37-
elif [ -x "$custom_package_checker_script_path" ]; then
38-
echo "--- [${package}] Run individual package checker"
39-
"$custom_package_checker_script_path"
40-
else
41-
echo "--- [${package}] Individual package checker $custom_package_checker_script_path is not found, continue..."
4235
fi
4336
popd > /dev/null
4437

45-
exit "${exit_code}"
38+
if [ "${exit_code}" -ne 0 ]] ; then
39+
exit "${exit_code}"
40+
fi
41+
42+
custom_package_checker_script_path="${SCRIPTS_BUILDKITE_PATH}/packages/${package}.sh"
43+
44+
if [ -x "$custom_package_checker_script_path" ]; then
45+
echo "--- [${package}] Run individual package checker"
46+
"$custom_package_checker_script_path"
47+
fi

0 commit comments

Comments
 (0)