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

(PA-6760) Update task_acceptance tests for MacOS15 ARM #752

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

skyamgarp
Copy link
Contributor

@skyamgarp skyamgarp commented Jan 20, 2025

For MacOS 15(ARM) -
With this PR we are trying to only install puppet8. The upgrade part we will cover with another jira.
We don't support puppet7 for MacOS 15(ARM). So we don't need tests to upgrade the agent from puppet7 to puppet 8.

@skyamgarp skyamgarp force-pushed the PA-6760 branch 3 times, most recently from 7e43f60 to 46c08a4 Compare January 21, 2025 10:34
@skyamgarp skyamgarp marked this pull request as ready for review January 21, 2025 13:11
@skyamgarp skyamgarp requested review from bastelfreak and a team as code owners January 21, 2025 13:11
when %r{ubuntu-24.04}
'7.32.1'
when latest_platform_list
'latest'
Copy link
Contributor

Choose a reason for hiding this comment

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

Since latest_platform_list includes macOS 15, this seems to imply we should install puppet7 nightly on macOS 15, but we know that's not supported...

I'm wondering if it would be clearer to separate the different use cases as:

  1. Happy Path: There are puppet7 and 8 released versions available. Install the earliest puppet7 version and upgrade to puppet 8.
  2. New Agent hasn't been released yet (like macOS 15 is now). Install the latest dev version.
  3. New Agent recently released (like macOS 15 will be in March). Install the earliest puppet8 version and upgrade to the latest dev version.
  4. New Agent with multiple releases (like macOS 15 after 8.12.0 comes out). Install the earliest puppet8 version and upgrade to the latest released version.

All 4 cases should be idempotent, so after the step is finished, if you run puppet agent -t again, it shouldn't attempt to upgrade/downgrade.

Copy link
Contributor Author

@skyamgarp skyamgarp Jan 23, 2025

Choose a reason for hiding this comment

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

This won't be applicable as this is in the else part of the case which won't be matched when we are running tests for macos15. I will remove this part to reduce ambiguity.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This PR targets the 2nd case and 1st is existing behaviour, for 3rd case we have a separate jira in which maybe we can add 4th case as well or have new jira for same.


# Use nightlies for unreleased platforms
# puppet_7_collection = 'puppet7-nightly'
# puppet_8_collection = 'puppet8-nightly'
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit, these 3 lines aren't applicable anymore, could you remove them?

# false
# else
# true
# end
Copy link
Contributor

Choose a reason for hiding this comment

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

nit, could you remove the commented out block that starts with multiple_puppet7_versions

# true
# end
multiple_puppet7_versions = case target_platform
when %r{el-9-ppc64le|amazon-2|ubuntu-24|fedora-40}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
when %r{el-9-ppc64le|amazon-2|ubuntu-24|fedora-40}
when # %r{operatingsystem-version-architecture}

That line was added when those platforms were added in 7.31.0. See https://github.com/puppetlabs/puppetlabs-puppet_agent/pull/752/files#diff-49e04ead14b575f80ad5dc0542c02aaabd03fffe27b8098d8afaec6659378544R101-R102

Since there have been multiple releases since 7.31.0, we should be able to test 7.x to 7.y upgrades on those platforms.

@joshcooper
Copy link
Contributor

(PA-6760) Updated tests

(PA-6760) Fix rubocop

(PA-6760) Updated mac_source

(PA-6760) Updated tests

(PA-6760) Updated tests
@skyamgarp
Copy link
Contributor Author

skyamgarp commented Jan 24, 2025

For task_acceptance tests we don't have ad-hoc pipeline. Tested on local for macos-15 arm and macos14 arm.
Successful ad-hoc execution for puppet_acceptance tests: https://jenkins-platform.delivery.puppetlabs.net/view/puppet-agent/view/puppetlabs-puppet_agent%20module/view/ad-hoc/job/forge-module_puppetlabs-puppet-agent-module_intn-sys_pa-acceptance_7-nightly_to_8-nightly-adhoc/57/

@joshcooper joshcooper merged commit d12b00c into puppetlabs:main Jan 24, 2025
16 checks passed
@skyamgarp skyamgarp deleted the PA-6760 branch January 24, 2025 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants