Support version upgrade for MSI packages #1808
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>
bryan-aguilar
approved these changes
Feb 2, 2023
Aneurysm9
reviewed
Feb 2, 2023
Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
vasireddy99
added a commit
that referenced
this pull request
Feb 7, 2023
* [chore]- Merge release/v0.25.0 branch to main v0.68.0 (#1792) * update allowlist to include operator version 0.68.0 (#1783) * update allowlist to include operator version 0.68.0 * Updating allowlist * Add ref for cache-from value (#1778) (#1787) Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> * Use us-west-2 region in prod (#1794) --------- Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com> Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> * Limit Cocurrent jobs to 4 (#1795) * Added retry wait time of 10 sec between failed jobs (#1796) * Login public ECR to increase rate limit (#1798) * Add PR build creds (#1803) * Remove wait duration and max concurrency (#1805) * Support version upgrade for MSI packages (#1808) * update windows package * add unique product ID * Linting * Add unique Product ID string * move major upgrade below package tag * Generate GUID using GUIDgen * Update tools/packaging/windows/aws-otel-collector.wxs Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> * Update sed search pattern * Update tools/release/bump-version-and-create-release-note.sh * Update tools/release/bump-version-and-create-release-note.sh Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> --------- Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> * bump version to v0.26.0 (#1809) * Update Readme links for docs (#1812) Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> --------- Co-authored-by: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com> Co-authored-by: Paurush Garg <62579325+PaurushGarg@users.noreply.github.com> Co-authored-by: Kausik <kausika@amazon.com> Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
This PR super-seeds #1764. Two major changes are defined in the PR
The new functionality updates the version attribute inside tools/packaging/windows/aws-otel-collector.wxs when bump-version-and-create-release-note.sh is run as part of CD process. This will ensure we build windows packages with the right version
According to wix documentation, it is advised to have a static product ID when building packages so introduced a unique string to update this.
Add MajorUpgrade tag to ensure new version of collector uninstalls the older version of ADOT collector and installs the new one. This mitigates the issue of two collectors being installed and run simultaneously.
Note-1: Currently the sed patterm supports [0-9].[0-9].[0-9]* version pattern. If we ever decide to release with a full semantic version with prefix as vX.XX.XX-prerelease then the .wxs file will need to be manually updated
Note-2: We need not update the CD workflow as mentioned in issue #1765. We update the aws-otel-collector.wxs with value inside VERSIONS. So just checking the VERSION with the version inputted in the CD workflow dispatch would be enough to ensure an incorrect version of windows is not released. This is already been done here
Testing:
Tested locally buy building different versions of ADOT windows packages and installing them on a local machine
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.