Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[8.1](backport #2172) feat: support downloading project artifacts for the new bucket layout#2181

Merged
mdelapenya merged 2 commits into8.1from
mergify/bp/8.1/pr-2172
Feb 28, 2022
Merged

[8.1](backport #2172) feat: support downloading project artifacts for the new bucket layout#2181
mdelapenya merged 2 commits into8.1from
mergify/bp/8.1/pr-2172

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 28, 2022

This is an automatic backport of pull request #2172 done by Mergify.
Cherry-pick of 044dedf has failed:

On branch mergify/bp/8.1/pr-2172
Your branch is up to date with 'origin/8.1'.

You are currently cherry-picking commit 044dedf4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .ci/ansible/tasks/setup_test_script.yml
	modified:   .ci/bump-stack-version.sh
	modified:   .ci/scripts/functional-test.sh
	modified:   e2e/README.md
	modified:   e2e/_suites/fleet/README.md
	modified:   e2e/_suites/fleet/fleet.go
	modified:   e2e/_suites/fleet/ingest_manager_test.go
	modified:   e2e/_suites/fleet/stand-alone.go
	modified:   e2e/_suites/kubernetes-autodiscover/README.md
	modified:   e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
	modified:   internal/common/defaults.go
	modified:   internal/deploy/docker.go
	modified:   internal/deploy/docker_test.go
	modified:   internal/deploy/elastic_package.go
	modified:   internal/installer/elasticagent_deb.go
	modified:   internal/installer/elasticagent_docker.go
	modified:   internal/installer/elasticagent_rpm.go
	modified:   internal/installer/elasticagent_tar.go
	modified:   internal/installer/elasticagent_tar_macos.go
	modified:   internal/installer/elasticagent_zip.go
	new file:   pkg/downloads/buckets.go
	new file:   pkg/downloads/buckets_test.go
	modified:   pkg/downloads/versions.go
	modified:   pkg/downloads/versions_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/Jenkinsfile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mdelapenya
feat: support downloading project artifacts for the new bucket layout (…
a6fd025 
…#2172)

* feat: support for the new bucket structure

* feat: calculate bucket URLs using resolvers

* chore: support for legacy Beats

Old PRs needs to be tested and the binaries could not exist in the new layout

* chore: support looking up the bucket in up-to 3 locations

1. new project layout
2. new beats layout
3. legacy beats layout

* chore: simplify boolean logic

* fix: pass worker environment for versions to the VMs

* fix: predefine kibana version

* fix: remove extra char

* fix: remove extra char

* chore: log resolvers

* chore: use new project method when fetching artifacts

* fix: pass stack version to stack deployment

* fix: use artifact to check for ubi8 variant

* chore: improve logs in resolvers

* fix: apply variants to project resolver

Ubi8 is a valid variant for elastic-agent

* chore: use Stack version for the dependant beats

In the running-on-top-of-beats feature file, the code installs some Beats
and we do not want to use the given SHA, because elastic-agent now lives
in a separate repo, therefore they do not share commit SHAs

* fix: use fleet-ci bucket for elastic-agent and fleet-server

* chore: look up both CI buckets

* chore: make useCISnapshots configurable on downloads

* chore: background processes should not use CI snapshots

* feat: separate elastic-agent version from beats version

* chore: extract useCISnapshots to a function

* chore: use Github_Check_Repo to identify where the Git commit lives

* fix: k8s-autodiscover lives in both worlds

* fix: missing package

* fix: use snapshot version in k8s-autodiscover

(cherry picked from commit 044dedf)

# Conflicts:
#	.ci/Jenkinsfile
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 28, 2022
@mdelapenya mdelapenya added backport-skip Skip notification from the automated backport with mergify and removed conflicts There is a conflict in the backported pull request labels Feb 28, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 28, 2022

💔 Tests Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-02-28T18:11:45.729+0000

  • Duration: 65 min 4 sec

Test stats 🧪

Test Results
Failed 1
Passed 267
Skipped 0
Total 268

Test errors 1

Expand to view the tests failures

Initializing / End-To-End Tests / kubernetes-autodiscover_debian_amd64_elastic-agent / [empty] – TEST-x86_64-kubernetes-autodiscover-f6c3dcbb-2022-02-28-18:47:38.xml
  • no error details
    • Expand to view the stacktrace

     Test report file /var/lib/jenkins/workspace/PR-2181-2-9a8433b2-8aa1-46bb-a7e8-d714c4ca4662/outputs/52.14.115.73/TEST-x86_64-kubernetes-autodiscover-f6c3dcbb-2022-02-28-18:47:38.xml was length 0

Pipeline error 1

This error is likely related to the pipeline itself. Please go to the traditional console output here" You will see the error (either a wrong syntax or configuration)

🐛 Flaky test report

❕ There are test failures but not known flaky tests.

Expand to view the summary

Genuine test errors 1

💔 There are test failures but not known flaky tests, most likely a genuine test failure.

  • Name: Initializing / End-To-End Tests / kubernetes-autodiscover_debian_amd64_elastic-agent / [empty] – TEST-x86_64-kubernetes-autodiscover-f6c3dcbb-2022-02-28-18:47:38.xml

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@mdelapenya mdelapenya merged commit 34dd871 into 8.1 Feb 28, 2022
@mergify mergify bot deleted the mergify/bp/8.1/pr-2172 branch February 28, 2022 19:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@mdelapenya mdelapenya

Labels

backport-skip Skip notification from the automated backport with mergify

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @mdelapenya