(PA-6677) Restore AL2 x86_64 install task and manifest #724
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
joshcooper
force-pushed
the
amazon-2-aarch64
branch
2 times, most recently
from
6633773 to
caa51e9
Compare
bastelfreak
reviewed
Jun 22, 2024
joshcooper
force-pushed
the
amazon-2-aarch64
branch
2 times, most recently
from
0e12488 to
eddc84a
Compare
bastelfreak
reviewed
Jun 24, 2024
joshcooper
force-pushed
the
amazon-2-aarch64
branch
3 times, most recently
from
f36f386 to
f15d3fb
Compare
joshcooper
changed the title
joshcooper
force-pushed
the
amazon-2-aarch64
branch
from
f15d3fb to
cc77fc9
Compare
amitkarsale
reviewed
Jun 27, 2024
The os.release.major fact is defined to be a string[1], so stub it accordingly [1] https://github.com/puppetlabs/facter/blob/4.7.1/lib/schema/facter.yaml#L1156-L1157
Commit 5c3ffe8 fixed AL2 aarch64, but broke AL2 x86_64. This commit restores the previous behavior of installing AL2 packages on AL2 aarch64. It preserves the existing behavior of installing EL6/7 packages on AL1/2 x86_64, respectively.
Commit bf467db fixed AL2 aarch64, but broke AL2 x86_64 causing the task to install the `puppetN-release-amazon-2.noarch.rpm` release package, but later the `yum install puppet-agent` command failed, since there are no AL2 x86_64 builds. It also broke future releases of amazon, so the hypothetical AL 2025 would fallback to el-2025. This commit results on the following mapping: AL2 x86_64 -> puppetN-release-el-7.noarch.rpm AL2 aarch64 -> puppetN-release-amazon-2.noarch.rpm AL2023 (all) -> puppetN-release-amazon-2023.noarch.rpm And ensures future AL releases work as expected.
This module does not list OS versions in its supported metadata, so just add "AmazonLinux" as a supported OS. The name was taken from puppetlabs-stdlib, instead of Amazon or AL.
joshcooper
force-pushed
the
amazon-2-aarch64
branch
from
cc77fc9 to
3f9ea74
Compare
mhashizume
approved these changes
Jun 27, 2024
mhashizume
reviewed
Jun 27, 2024
| # For Amazon Linux 2023 and onwards we can use the 'amazon' packages created instead of 'el' packages | ||
| if (( $platform_version == 2023 || $platform_version == 2 )); then | ||
| arch="$(uname -p)" | ||
| # Install amazon packages on AL2 (only aarch64) and 2003 and up (all arch) |
There was a problem hiding this comment.
Nit, but this says 2003 instead of 2023.
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.
Previous commits fixed AL2 aarch64, but broke x86_64.
Added
AmazonLinuxto metadata.jsonAfter this is merged, install-puppet.sh needs to be regenerated
This should fix https://jenkins-enterprise.delivery.puppetlabs.net/view/pe-integration/view/pe-2021.7.x/job/enterprise_pe-acceptance-tests_integration-system_pe_full-agent-upgrade_nightly_2021.7.x/