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

Update main branch #1928

Merged
merged 1 commit into from
Dec 20, 2021
Merged

Update main branch #1928

merged 1 commit into from
Dec 20, 2021

Conversation

v1v
Copy link
Member

@v1v v1v commented Dec 19, 2021

What does this PR do?

Update main branch in the JJBB/Jenkinsfile/Docs and other places

@mergify
Copy link
Contributor

mergify bot commented Dec 19, 2021

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Dec 19, 2021
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

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: 2021-12-19T16:11:12.391+0000

  • Duration: 36 min 24 sec

  • Commit: f5dea2f

Test stats 🧪

Test Results
Failed 0
Passed 216
Skipped 0
Total 216

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@v1v v1v added backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify backport-v7.17.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify labels Dec 20, 2021
@v1v v1v merged commit 304c97f into elastic:main Dec 20, 2021
@v1v v1v deleted the feature/update-main branch December 20, 2021 10:50
mergify bot pushed a commit that referenced this pull request Dec 20, 2021
@v1v
Update main branch (#1928)
c4bf3a7 
(cherry picked from commit 304c97f)

# Conflicts:
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.ci/jobs/e2e-testing-mbp.yml
#	.mergify.yml
@mergify mergify bot mentioned this pull request Dec 20, 2021
Merged
mergify bot pushed a commit that referenced this pull request Dec 20, 2021
@v1v
Update main branch (#1928)
e1d2b7f 
(cherry picked from commit 304c97f)

# Conflicts:
#	.ci/build-docker-images.groovy
#	.ci/e2eKibana.groovy
#	.ci/jobs/build-docker-images.yml
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.ci/jobs/e2e-testing-mbp.yml
#	.ci/jobs/fleet-server-e2e-tests.yml
#	.ci/jobs/kibana-e2e-tests.yml
#	.mergify.yml
@mergify mergify bot mentioned this pull request Dec 20, 2021
Merged
mergify bot pushed a commit that referenced this pull request Dec 20, 2021
@v1v
Update main branch (#1928)
8489cd3 
(cherry picked from commit 304c97f)

# Conflicts:
#	.ci/build-docker-images.groovy
#	.ci/e2eKibana.groovy
#	.ci/jobs/build-docker-images.yml
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.ci/jobs/e2e-testing-mbp.yml
#	.ci/jobs/fleet-server-e2e-tests.yml
#	.ci/jobs/kibana-e2e-tests.yml
#	.mergify.yml
@mergify mergify bot mentioned this pull request Dec 20, 2021
Merged
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Dec 20, 2021
mdelapenya pushed a commit that referenced this pull request Dec 20, 2021
@mergify @v1v
[8.0](backport #1928) Update main branch (#1931)
6c98999 
* Update main branch (#1928)

(cherry picked from commit 304c97f)

# Conflicts:
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.ci/jobs/e2e-testing-mbp.yml
#	.mergify.yml

* use main version for mergify and jjbb

Co-authored-by: Victor Martinez <[email protected]>
mdelapenya added a commit that referenced this pull request Dec 20, 2021
@mergify @v1v @mdelapenya
[7.15](backport #1928) Update main branch (#1933)
d6daa47 
* Update main branch (#1928)

(cherry picked from commit 304c97f)

# Conflicts:
#	.ci/build-docker-images.groovy
#	.ci/e2eKibana.groovy
#	.ci/jobs/build-docker-images.yml
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.ci/jobs/e2e-testing-mbp.yml
#	.ci/jobs/fleet-server-e2e-tests.yml
#	.ci/jobs/kibana-e2e-tests.yml
#	.mergify.yml

* use main version for mergify and jjbb

* chore: remove pipelines that are not triggered in maintenance branches

Co-authored-by: Victor Martinez <[email protected]>
Co-authored-by: Manuel de la Peña <[email protected]>
mdelapenya added a commit that referenced this pull request Dec 20, 2021
@mergify @v1v @mdelapenya
[7.16](backport #1928) Update main branch (#1932)
fc1e24b 
* Update main branch (#1928)

(cherry picked from commit 304c97f)

# Conflicts:
#	.ci/build-docker-images.groovy
#	.ci/e2eKibana.groovy
#	.ci/jobs/build-docker-images.yml
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.ci/jobs/e2e-testing-mbp.yml
#	.ci/jobs/fleet-server-e2e-tests.yml
#	.ci/jobs/kibana-e2e-tests.yml
#	.mergify.yml

* use main version for mergify and jjbb

* chore: remove pipelines that are not triggered in maintenance branches

* chore: remove pipelines that are not triggered in maintenance branches

Co-authored-by: Victor Martinez <[email protected]>
Co-authored-by: Manuel de la Peña <[email protected]>
mdelapenya added a commit to mdelapenya/e2e-testing that referenced this pull request Jan 26, 2022
@mdelapenya
Merge branch 'main' into 1781-rename-to-aarch64
7ecd99f 
* main: (45 commits)
  feat: add CentOS 8 support (elastic#2034)
  fix: set default region for AWS cli (elastic#2053)
  chore: use Ansible's built-in replace instead of sed (elastic#2048)
  chore: split stack configuration and start into two tasks (elastic#2044)
  feat: enable SSH access to users for debugging cloud instances (elastic#2001)
  fix: use the right branch for 7.17 backports (elastic#2025)
  SLES15 enablement (elastic#2007)
  chore: bump stale agent for main (elastic#2014)
  Update `fetchBeatsBinary` to be reused in elastic-agent-poc (elastic#1984)
  chore: add resiliency when provisioning the stack (elastic#1990)
  chore: bump elastic-package to v0.32.1 (elastic#1959)
  feat: export Fetch&Download methods in the /pkg directory (elastic#1943)
  bump stack version 8.1.0-dbc834fd (elastic#1948)
  bump stack version 8.1.0-76902d39 (elastic#1946)
  chore: retire 7.15 adding 7.17 (elastic#1938)
  ci: use withAPMEnv (elastic#1917)
  Update main branch (elastic#1928)
  bump stack version 8.1.0-befff95a (elastic#1929)
  chore: properly evaluate how tests are skipped on CI when checking modified files (elastic#1924)
  bump stack version 8.1.0-60bffc32 (elastic#1921)
  ...
mdelapenya added a commit to mdelapenya/e2e-testing that referenced this pull request Mar 30, 2022
@mdelapenya
Merge branch 'main' into refactor-installer
35e8811 
* main:
  chore: retire 7.15 adding 7.17 (elastic#1938)
  ci: use withAPMEnv (elastic#1917)
  Update main branch (elastic#1928)
  bump stack version 8.1.0-befff95a (elastic#1929)
  chore: properly evaluate how tests are skipped on CI when checking modified files (elastic#1924)
  bump stack version 8.1.0-60bffc32 (elastic#1921)
  fix: add resiliency when an integration cannot be added to a policy (elastic#1914)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mdelapenya mdelapenya mdelapenya approved these changes

Assignees
No one assigned
Labels
backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify backport-v7.17.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@v1v @elasticmachine @mdelapenya