Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[8.x](backport #6578) Fix selection of testing version #7028

Open
wants to merge 3 commits into
base: 8.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2025

SLightly changing algorithm to select test versions

with config

{
  "UpgradeToVersion": "9.0.0",
  "CurrentMajors": 1,
  "PreviousMajors": 1,
  "PreviousMinors": 2,
  "SnapshotBranches": [
    "8.x",
    "8.17",
    "7.17"
  ]
}

these available versions

-8.16.3
-8.17.1
-7.17.27
-8.16.2
-8.17.0
-7.17.26
-8.15.5
-8.16.1
-8.16.0
-8.15.4
-8.15.3+build202411051926
-7.17.25
-and so on

resolved to

before change:

  - 8.18.0-SNAPSHOT
  - 8.17.1
  - 8.17.1-SNAPSHOT
  - 8.17.0
  - 7.17.28-SNAPSHOT

after change:

  - 8.18.0-SNAPSHOT
  - 8.17.1
  - 8.17.1-SNAPSHOT
  - 8.16.3
  - 7.17.28-SNAPSHOT

as we wanted 1 previous major in case of target 9.0.0 it is 8.x
and 2 previous minors so out of 8.x we took latest patches for 8.17 and 8.16 as released ones


This is an automatic backport of pull request #6578 done by Mergify.

* mark and skip flaky TestOTelManager_Run

* updated test version selection

* Update testing/upgradetest/versions.go

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

* updated versions

* pin 9.0

* pin 9.0

* removed version pin for 9.0

* Update magefile.go

* updated branches

* fix previousMinor for pinned 9.0

---------

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
(cherry picked from commit 2614cb5)

# Conflicts:
#	testing/upgradetest/versions.go
@mergify mergify bot requested a review from a team as a code owner February 25, 2025 20:08
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 25, 2025
@mergify mergify bot requested review from blakerouse and kaanyalti and removed request for a team February 25, 2025 20:08
Copy link
Contributor Author

mergify bot commented Feb 25, 2025

Cherry-pick of 2614cb5 has failed:

On branch mergify/bp/8.x/pr-6578
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 2614cb516.
  (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:   testing/integration/testdata/.upgrade-test-agent-versions.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/upgradetest/versions.go

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

@github-actions github-actions bot added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Feb 25, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Contributor

💔 Build Failed

Failed CI Steps

History

cc @michalpristas

@pkoutsovasilis
Copy link
Contributor

@michalpristas this backport should happen right? 🙂

@pkoutsovasilis
Copy link
Contributor

All CI failures are captured by Open issues thus I am retrying them 🙂

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
backport bug Something isn't working conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants