[8.17](backport #6578) Fix selection of testing version #7026

mergify · 2025-02-25T20:08:14Z

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 <[email protected]> * 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 <[email protected]> Co-authored-by: Panos Koutsovasilis <[email protected]> (cherry picked from commit 2614cb5) # Conflicts: # testing/integration/testdata/.upgrade-test-agent-versions.yml # testing/upgradetest/versions.go

mergify · 2025-02-25T20:08:16Z

Cherry-pick of 2614cb5 has failed:

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

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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/integration/testdata/.upgrade-test-agent-versions.yml
	both modified:   testing/upgradetest/versions.go

no changes added to commit (use "git add" and/or "git commit -a")

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