migrate x-pack/libbeat to static #38964
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,14 +14,14 @@ XPACK_MODULE_PATTERN="^x-pack\\/[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*" | |
| # define if needed run the whole pipeline for the particular beat | ||
| [ -z "${run_filebeat+x}" ] && run_filebeat="$(buildkite-agent meta-data get run_filebeat --default "false")" | ||
| [ -z "${run_packetbeat+x}" ] && run_packetbeat="$(buildkite-agent meta-data get run_packetbeat --default "false")" | ||
| [ -z "${run_xpack_metricbeat+x}" ] && run_xpack_metricbeat="$(buildkite-agent meta-data get run_xpack_metricbeat --default "false")" | ||
| [ -z "${run_xpack_packetbeat+x}" ] && run_xpack_packetbeat="$(buildkite-agent meta-data get run_xpack_packetbeat --default "false")" | ||
|
|
||
| # define if needed run ARM platform-specific tests for the particular beat | ||
| [ -z "${run_filebeat_arm_tests+x}" ] && run_filebeat_arm_tests="$(buildkite-agent meta-data get run_filebeat_arm_tests --default "false")" | ||
| [ -z "${run_packetbeat_arm_tests+x}" ] && run_packetbeat_arm_tests="$(buildkite-agent meta-data get run_packetbeat_arm_tests --default "false")" | ||
| [ -z "${run_xpack_packetbeat_arm_tests+x}" ] && run_xpack_packetbeat_arm_tests="$(buildkite-agent meta-data get run_xpack_packetbeat_arm_tests --default "false")" | ||
|
|
||
| # define if needed run MacOS platform-specific tests for the particular beat | ||
sharbuz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [ -z "${run_packetbeat_macos_tests+x}" ] && run_packetbeat_macos_tests="$(buildkite-agent meta-data get run_packetbeat_macos_tests --default "false")" | ||
| [ -z "${run_xpack_metricbeat_macos_tests+x}" ] && run_xpack_metricbeat_macos_tests="$(buildkite-agent meta-data get run_xpack_metricbeat_macos_tests --default "false")" | ||
|
|
@@ -30,10 +30,6 @@ XPACK_MODULE_PATTERN="^x-pack\\/[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*" | |
| # define if needed run cloud-specific tests for the particular beat | ||
| [ -z "${run_xpack_metricbeat_aws_tests+x}" ] && run_xpack_metricbeat_aws_tests="$(buildkite-agent meta-data get run_xpack_metricbeat_aws_tests --default "false")" | ||
|
|
||
|
There was a problem hiding this comment. is this on purpose? given that the PR is about There was a problem hiding this comment. libbeat pipeline has already merged. Line 268 in cd81faa |
||
| packetbeat_changeset=( | ||
| "^packetbeat/.*" | ||
| ) | ||
|
|
@@ -46,10 +42,6 @@ xpack_dockerlogbeat_changeset=( | |
| "^x-pack/dockerlogbeat/.*" | ||
| ) | ||
|
|
||
| xpack_packetbeat_changeset=( | ||
| "^x-pack/packetbeat/.*" | ||
| ) | ||
|
|
@@ -75,7 +67,6 @@ oss_changeset=( | |
| ) | ||
|
|
||
| xpack_changeset=( | ||
| "${oss_changeset[@]}" | ||
| ) | ||
|
|
||
|
|
@@ -90,18 +81,12 @@ packaging_changeset=( | |
| ) | ||
|
|
||
| case "${BUILDKITE_PIPELINE_SLUG}" in | ||
|
There was a problem hiding this comment. are we intentionally removing |
||
| "beats-packetbeat") | ||
| BEAT_CHANGESET_REFERENCE=${packetbeat_changeset[@]} | ||
| ;; | ||
| "beats-winlogbeat") | ||
| BEAT_CHANGESET_REFERENCE=${winlogbeat_changeset[@]} | ||
| ;; | ||
| "beats-xpack-metricbeat") | ||
| BEAT_CHANGESET_REFERENCE=${xpack_metricbeat_changeset[@]} | ||
| ;; | ||
|
|
@@ -347,7 +332,7 @@ are_conditions_met_mandatory_tests() { | |
|
|
||
| are_conditions_met_arm_tests() { | ||
| if are_conditions_met_mandatory_tests; then #from https://github.com/elastic/beats/blob/c5e79a25d05d5bdfa9da4d187fe89523faa42afc/Jenkinsfile#L145-L171 | ||
| if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-packetbeat" ]]; then | ||
| if [[ "${GITHUB_PR_TRIGGER_COMMENT}" == "${BEATS_GH_ARM_COMMENT}" || "${GITHUB_PR_LABELS}" =~ ${BEATS_GH_ARM_LABEL} || "${!TRIGGER_SPECIFIC_ARM_TESTS}" == "true" ]]; then | ||
| return 0 | ||
| fi | ||
|
|
@@ -539,4 +524,4 @@ if [[ "$BUILDKITE_STEP_KEY" == "xpack-winlogbeat-pipeline" || "$BUILDKITE_STEP_K | |
| defineModuleFromTheChangeSet "${BEATS_PROJECT_NAME}" | ||
| fi | ||
|
|
||
| check_and_set_beat_vars | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My understanding from /Jenkinsfile.yml is that the common changesets for x-pack are:
we've already used this pattern in x-pack/heartbeat so perhaps we can standardize i.e. replace both oss and x-pack with one "# x-pack" section for x-pack related projects (similar to Jenkinsfile)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, let's compare what we have:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or you mean we shouldn't merge them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
they are the same, I am just saying that for consistency's sake we should have a section
for all x-pack pipelines. The pipeline specific bits will, of course, remain above, so the total thing with my proposal would be: