[Security Solution][Endpoint] New enroll endpoint host function CI specific for Cypress tests to use cached agent files by dasansol92 · Pull Request #171399 · elastic/kibana

dasansol92 · 2023-11-16T13:04:40Z

Summary

In order to avoid downloading the elastic agent installer file on each Cypress test, we have introduced a new method CI specific that will cache elastic agent files and reuse it across all tests.

Old code about if CI conditions will be removed in a follow up pr.

It also introduces a CLI script to download a specific version of elastic agent using the existing methods in place.

…agents in CI

ashokaditya

Tested it out and it works nicely! I've few suggestions and nits but this is good to 🚢 !

ashokaditya · 2023-11-16T13:11:23Z

+  // Check if agent file is already on disk before downloading it again
+  agentDownload = isAgentDownloadFromDiskAvailable(agentFileName);
+
+  // If it has not been already dowloaded, it has to be donwnloaded.


nit:

Suggested change

// If it has not been already dowloaded, it has to be donwnloaded.

// If it has not been already downloaded, it should be downloaded.

ashokaditya · 2023-11-16T13:14:09Z

+                  log,
+                  kbnClient,
+                })
+              : await createAndEnrollEndpointHost({


You can now remove the CI check and dependent code in createAndEnrollEndpointHost that also has a vagrant VM creation logic

Yes, I added a note in the description about doing that in a follow up pr.

ashokaditya · 2023-11-16T13:19:01Z

 export const downloadAndStoreAgent = async (
-  agentDownloadUrl: string
+  agentDownloadUrl: string,
+  agentFileName?: string


nit: please also add the new param to JSDoc above

ashokaditya · 2023-11-16T13:20:40Z

-    `UNSUPPORTED_ARCHITECTURE_${process.arch}`;
-  const fileNameNoExtension = `elastic-agent-${agentVersion}-linux-${downloadArch}`;
+
+  const fileNameNoExtension = getAgentFileName(agentVersion);


nit:

Suggested change

const fileNameNoExtension = getAgentFileName(agentVersion);

const fileNameWithoutExtension = getAgentFileName(agentVersion);

…int_host_using_cached_agent_installers

jbudz · 2023-11-16T19:35:28Z

packer_cache.sh build didn't have any issues.

The new image can be tested by replacing n2-4-spot with n2-4-spot-test or n2-4-virt with n2-4-virt-test in the pipeline configuration for any tests you're interested in and re-triggering CI. We should revert this change before merging.

elasticmachine · 2023-11-27T17:19:50Z

Pinging @elastic/security-defend-workflows (Team:Defend Workflows)

paul-tavares

👍

ashokaditya

🚀

dasansol92 · 2023-11-28T09:50:34Z

@elasticmachine merge upstream

…int_host_using_cached_agent_installers

tomsonpl

Hey, interesting changes, thanks for investing time and efforts into fixing this issue 👍

I left a few comments, but in general lgtm 👍

tomsonpl · 2023-11-28T09:53:32Z

  node scripts/es snapshot --download-only --base-path "$ES_CACHE_DIR" --version "$version"
 done

+for version in $(cat versions.json | jq -r '.versions[].version'); do


Do you think combining two for loops into one would be possible? What are the beenfits of doing it separately?

Yeah I think should be okay to download ES snapshot and agent in the same loop.

I went for that path in order to not block the existing code path if something fails with the elastic agent download

tomsonpl · 2023-11-28T09:59:55Z

+            log.info(`Creating endpoint host, attempt ${retryAttempt}`);
+            const newHost = process.env.CI
+              ? await createAndEnrollEndpointHostCI({
+                  useClosestVersionMatch: true,


if I understand correctly options can contain useClosestVersionMatch , do we want to let the hardcoded one be overwritten by options? What is the reason for this order, asking because this looks confusing to me :)

even more confusing since we set useClosestVersionMatch to default to true in the function params

This looks like a typo in the order introduced here. 🤔

Good call, this was a copy/paste of the existing code here. I'm ok removing this since the default value is true in a follow up pr if that looks good to you

kibana-ci · 2023-11-28T11:38:02Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: d2fab22

Failed CI Steps

Defend Workflows Cypress Tests on Serverless #2

Test Failures

[job] [logs] Defend Workflows Cypress Tests on Serverless #2 / Response console Execute operations: "execute --command" - should execute a command "execute --command" - should execute a command

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id	before	after	diff
`securitySolution`	464	465	+1

Total ESLint disabled count

id	before	after	diff
`securitySolution`	534	535	+1

History

💛 Build #179210 was flaky 296e16e
💚 Build #176595 succeeded ada8e9d
💔 Build #176559 failed 0c98fd6

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

dasansol92 added 4 commits November 15, 2023 10:34

New CLI script and new function to create endpoint hosts from cached …

09ab15f

…agents in CI

Adds default version

048d982

Adds logger to cli script

1cdc29e

Define destination name for agent folder in vagrant

85ed629

dasansol92 added release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting Team:Defend Workflows “EDR Workflows” sub-team of Security Solution skip-ci v8.12.0 labels Nov 16, 2023

dasansol92 requested a review from ashokaditya November 16, 2023 13:06

ashokaditya approved these changes Nov 16, 2023

View reviewed changes

Fixes typo and naming suggestions

afb49d7

dasansol92 removed the skip-ci label Nov 16, 2023

dasansol92 added 3 commits November 16, 2023 15:40

Merge branch 'main' into feat/olm-new_function_for_CI_to_create_endpo…

0c98fd6

…int_host_using_cached_agent_installers

Fixes file name and imports

ada8e9d

Uses agent_downloader in buildkite packer cache script

e8f3b98

dasansol92 added the skip-ci label Nov 16, 2023

dasansol92 added 2 commits November 27, 2023 15:37

Use test image for Defend Workflows cypress tests

dd64fc3

Unskip tests

296e16e

dasansol92 removed the skip-ci label Nov 27, 2023

dasansol92 marked this pull request as ready for review November 27, 2023 17:19

dasansol92 requested review from a team as code owners November 27, 2023 17:19

dasansol92 requested a review from parkiino November 27, 2023 17:19

dasansol92 requested a review from paul-tavares November 27, 2023 17:20

jbudz reviewed Nov 27, 2023

View reviewed changes

Comment thread .buildkite/pipelines/pull_request/base.yml

paul-tavares approved these changes Nov 27, 2023

View reviewed changes

ashokaditya approved these changes Nov 28, 2023

View reviewed changes

Revert queue change

798ae8d

Merge branch 'main' into feat/olm-new_function_for_CI_to_create_endpo…

d2fab22

…int_host_using_cached_agent_installers

tomsonpl reviewed Nov 28, 2023

View reviewed changes

dasansol92 requested a review from jbudz November 28, 2023 13:28

jbudz approved these changes Nov 28, 2023

View reviewed changes

dasansol92 merged commit 1823d94 into elastic:main Nov 28, 2023

	// If it has not been already dowloaded, it has to be donwnloaded.
	// If it has not been already downloaded, it should be downloaded.

	const fileNameNoExtension = getAgentFileName(agentVersion);
	const fileNameWithoutExtension = getAgentFileName(agentVersion);

Conversation

dasansol92 commented Nov 16, 2023

Summary

Uh oh!

ashokaditya left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jbudz commented Nov 16, 2023

Uh oh!

elasticmachine commented Nov 27, 2023

Uh oh!

Uh oh!

paul-tavares left a comment

Choose a reason for hiding this comment

Uh oh!

ashokaditya left a comment

Choose a reason for hiding this comment

Uh oh!

dasansol92 commented Nov 28, 2023

Uh oh!

tomsonpl left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kibana-ci commented Nov 28, 2023

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

Metrics [docs]

ESLint disabled line counts

Total ESLint disabled count

History

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants