+43
-26
lines changedFilter options
+43
-26
lines changed Original file line number Diff line number Diff line change
@@ -47,29 +47,7 @@ export CREATED_DATE
47 47 48 48
export TMP_FOLDER_TEMPLATE_BASE="tmp.${REPO}"
49 49
export TMP_FOLDER_TEMPLATE="${TMP_FOLDER_TEMPLATE_BASE}.XXXXXXXXX"
50 - 51 -
is_step_required_to_upload_safe_logs() {
52 -
if [[ "$BUILDKITE_PIPELINE_SLUG" != "elastic-package" && "$BUILDKITE_PIPELINE_SLUG" != "elastic-package-test-serverless" ]]; then
53 -
return 1
54 -
fi
55 - 56 -
if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-package" ]]; then
57 -
if [[ "$BUILDKITE_STEP_KEY" =~ ^integration-parallel || "$BUILDKITE_STEP_KEY" =~ ^integration-false_positives ]]; then
58 -
return 0
59 -
fi
60 -
fi
61 - 62 -
if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-package-test-serverless" ]]; then
63 -
if [[ "$BUILDKITE_STEP_KEY" == "test-serverless" ]]; then
64 -
return 0
65 -
fi
66 -
fi
67 -
return 1
68 -
}
69 - 70 -
if is_step_required_to_upload_safe_logs; then
71 -
export JOB_GCS_BUCKET_INTERNAL="ecosystem-ci-internal"
72 -
fi
50 +
export JOB_GCS_BUCKET_INTERNAL="ecosystem-ci-internal"
73 51 74 52
if [[ "${BUILDKITE_PIPELINE_SLUG}" == "elastic-package-test-serverless" ]]; then
75 53
if [[ "${BUILDKITE_STEP_KEY}" == "test-serverless" ]]; then
@@ -44,7 +44,6 @@ CHECK_PACKAGES_TESTS=(
44 44
test-check-packages-with-kind
45 45
test-check-packages-with-custom-agent
46 46
test-check-packages-benchmarks
47 -
test-check-packages-with-logstash
48 47
)
49 48
for test in "${CHECK_PACKAGES_TESTS[@]}"; do
50 49
test_name=${test#"test-check-packages-"}
@@ -63,6 +62,33 @@ for test in "${CHECK_PACKAGES_TESTS[@]}"; do
63 62
fi
64 63
done
65 64 65 +
# Testing with logstash with different versions needed because of failures in 9.x, see https://github.com/elastic/elastic-package/pull/2763.
66 +
pushd test/packages/with-logstash > /dev/null
67 +
while IFS= read -r -d '' package ; do
68 +
package_name=$(basename "${package}")
69 +
echo " - label: \":go: Integration test (with logstash): ${package_name}\""
70 +
echo " key: \"integration-with_logstash-${package_name}\""
71 +
echo " command: ./.buildkite/scripts/integration_tests.sh -t test-check-packages-with-logstash -p ${package_name}"
72 +
echo " env:"
73 +
echo " UPLOAD_SAFE_LOGS: 1"
74 +
echo " agents:"
75 +
echo " provider: \"gcp\""
76 +
echo " image: \"${UBUNTU_X86_64_AGENT_IMAGE}\""
77 +
echo " plugins:"
78 +
echo " # See https://github.com/elastic/oblt-infra/blob/main/conf/resources/repos/integrations/01-gcp-buildkite-oidc.tf"
79 +
echo " # This plugin authenticates to Google Cloud using the OIDC token."
80 +
echo " - elastic/oblt-google-auth#v1.2.0:"
81 +
echo " lifetime: 10800 # seconds"
82 +
echo " project-id: \"elastic-observability-ci\""
83 +
echo " project-number: \"911195782929\""
84 +
echo " artifact_paths:"
85 +
echo " - build/test-results/*.xml"
86 +
echo " - build/elastic-stack-dump/check-*/logs/*.log"
87 +
echo " - build/elastic-stack-dump/check-*/logs/fleet-server-internal/**/*"
88 +
echo " - build/test-coverage/coverage-*.xml" # these files should not be used to compute the final coverage of elastic-package
89 +
done < <(find . -maxdepth 1 -mindepth 1 -type d -print0)
90 +
popd > /dev/null
91 + 66 92
pushd test/packages/false_positives > /dev/null
67 93
while IFS= read -r -d '' package ; do
68 94
package_name=$(basename "${package}")
@@ -16,6 +16,7 @@ usage() {
16 16
PARALLEL_TARGET="test-check-packages-parallel"
17 17
FALSE_POSITIVES_TARGET="test-check-packages-false-positives"
18 18
KIND_TARGET="test-check-packages-with-kind"
19 +
LOGSTASH_TARGET="test-check-packages-with-logstash"
19 20
SYSTEM_TEST_FLAGS_TARGET="test-system-test-flags"
20 21
TEST_BUILD_ZIP_TARGET="test-build-zip"
21 22
TEST_BUILD_INSTALL_ZIP_TARGET="test-build-install-zip"
@@ -109,7 +110,14 @@ if [ -n "${PACKAGE}" ]; then
109 110
fi
110 111 111 112
echo "--- Run integration test ${label}"
112 -
if [[ "${TARGET}" == "${PARALLEL_TARGET}" ]] || [[ "${TARGET}" == "${FALSE_POSITIVES_TARGET}" ]]; then
113 +
test_each_package=false
114 +
case "${TARGET}" in
115 +
"${PARALLEL_TARGET}" | "${FALSE_POSITIVES_TARGET}" | "${LOGSTASH_TARGET}")
116 +
test_each_package=true
117 +
;;
118 +
esac
119 +
if [[ "${test_each_package}" == "true" ]]; then
120 +
make install
113 121
# allow to fail this command, to be able to upload safe logs
114 122
set +e
115 123
make SERVERLESS="${SERVERLESS}" PACKAGE_UNDER_TEST="${PACKAGE}" "${TARGET}"
@@ -6,5 +6,5 @@ package install
6 6 7 7
const (
8 8
// DefaultStackVersion is the default version of the stack
9 -
DefaultStackVersion = "8.18.3"
9 +
DefaultStackVersion = "9.0.4"
10 10
)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +
8.18.3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +
8.18.3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +
8.18.3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +
8.18.3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +
8.18.3
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4