Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Revert forcing Agent version to be 8.16.0 #5617

Merged
merged 4 commits into from
Oct 30, 2024

Conversation

ycombinator
Copy link
Contributor

@ycombinator ycombinator commented Sep 25, 2024

This PR reverts the changes made in #5565 as it is now possible to create 9.0.0-SNAPSHOT deployments on ESS prod in the CFT region.

Resolves #5567

@ycombinator ycombinator marked this pull request as ready for review September 25, 2024 21:48
@ycombinator ycombinator requested a review from a team as a code owner September 25, 2024 21:48
Copy link
Contributor

mergify bot commented Sep 25, 2024

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

  • backport-./d./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Sep 25, 2024

backport-v8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 25, 2024
@ycombinator ycombinator force-pushed the revert-816-force branch 3 times, most recently from 10d59b7 to 9d0b751 Compare October 1, 2024 23:57
@jlind23
Copy link
Contributor

jlind23 commented Oct 2, 2024

@michel-laterman it looks there is still an issue while communicating with fleet-server which is:
`

(linux-amd64-ubuntu-2404-fleet) Test output (sudo) (stdout): Error: fail to enroll: fail to execute request to fleet-server: status code: 400, fleet-server returned an error: UnsupportedVersion, message: version is not supported 
`

Do you know where this could be coming from? This happened on the extended runtime leak tests

@ycombinator
Copy link
Contributor Author

The issue seems to be that we are still creating an 8.16.0 deployment in ESS for some reason: https://buildkite.com/elastic/elastic-agent-extended-testing/builds/3296#01924d3f-01d4-4525-ae48-c1ddb2ded469/144-348

>>> Creating cloud stack 8.16.0-SNAPSHOT [stack_id: 8160-SNAPSHOT]
--
  | >>> Created cloud stack 8.16.0-SNAPSHOT [stack_id: 8160-SNAPSHOT, deployment_id: b463730b54b2456281dec88c341576a8]
  | >>> Waiting for cloud stack 8.16.0-SNAPSHOT to be ready [stack_id: 8160-SNAPSHOT, deployment_id: b463730b54b2456281dec88c341576a8]

.package-version Outdated
9.0.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pchila just want to double check that this change makes sense in this PR, especially because the reverse change was not part of the original PR: #5565. Thanks.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This normally is handled by the automation ---> #5588
since it would be a chicken and egg problem I guess we can update .package.version here and close the other PR once we merge this

@ycombinator
Copy link
Contributor Author

Now a bunch of tests are failing CI with:

        	Error:      	Received unexpected error:
        	            	failed to find a previous minor on the version list

I'm working on a fix for this issue and will add it to this PR.

@pchila
Copy link
Member

pchila commented Oct 7, 2024

Now a bunch of tests are failing CI with:

        	Error:      	Received unexpected error:
        	            	failed to find a previous minor on the version list

I'm working on a fix for this issue and will add it to this PR.

This happens because in our test where we look for a previous minor (still not convinced it is really needed) we don't handle the case of a new major with minor and patch version set to 0.

This would be a good opportunity to get rid of GetPreviousMinor() if possible

Copy link
Contributor

@rowlandgeoff rowlandgeoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as long as CI passes 😄

Copy link
Contributor

mergify bot commented Oct 23, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b revert-816-force upstream/revert-816-force
git merge upstream/main
git push upstream revert-816-force

1 similar comment
Copy link
Contributor

mergify bot commented Oct 29, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b revert-816-force upstream/revert-816-force
git merge upstream/main
git push upstream revert-816-force

Copy link

@ycombinator ycombinator merged commit a5de320 into elastic:main Oct 30, 2024
14 checks passed
@ycombinator ycombinator deleted the revert-816-force branch October 30, 2024 00:46
mergify bot pushed a commit that referenced this pull request Oct 30, 2024
* Revert forcing Agent version to be 8.16.0

* Update version in .package-version file

* Return latest minor of previous version if current version is first release of a new major

* Remove debugging statement

(cherry picked from commit a5de320)

# Conflicts:
#	.buildkite/scripts/steps/integration-package.sh
#	.buildkite/scripts/steps/integration_tests.sh
#	.buildkite/scripts/steps/k8s-extended-tests.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revert 8.16.0 agent package version on main
5 participants