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

[3006.x] Keep extras directory when upgrading Salt on macOS #65078

Merged
merged 6 commits into from
Aug 30, 2023

Conversation

twangboy
Copy link
Contributor

What does this PR do?

Fixes an issue with the macOS installer so that the extras-3.10 directory isn't removed during an upgrade.

What issues does this PR fix or reference?

Fixes: #65073

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

@twangboy twangboy requested a review from a team as a code owner August 29, 2023 00:31
@twangboy twangboy requested review from garethgreenaway and removed request for a team August 29, 2023 00:31
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title Keep extras macos [3006.x] Keep extras macos Aug 29, 2023
@twangboy twangboy temporarily deployed to ci August 29, 2023 00:46 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 00:46 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 00:46 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 00:46 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 01:01 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 01:06 — with GitHub Actions Inactive
@twangboy twangboy changed the title [3006.x] Keep extras macos [3006.x] Keep extras directory when upgrading macOS Aug 29, 2023
@twangboy twangboy changed the title [3006.x] Keep extras directory when upgrading macOS [3006.x] Keep extras directory when upgrading Salt on macOS Aug 29, 2023
Copy link
Collaborator

@s0undt3ch s0undt3ch left a comment

Choose a reason for hiding this comment

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

Can we also have a pkg test which confirms that a previously existing package installed in extras-3.x is kept during upgrades?

And if we have a test like that(we do for linux?) let's make sure it also runs on macos.

pkg/macos/build.sh Outdated Show resolved Hide resolved
pkg/macos/pkg-scripts/preinstall Show resolved Hide resolved
@MKLeb
Copy link
Contributor

MKLeb commented Aug 29, 2023

Can we also have a pkg test which confirms that a previously existing package installed in extras-3.x is kept during upgrades?

And if we have a test like that(we do for linux?) let's make sure it also runs on macos.

There is a test for this in test_salt_upgrade, but right now it's not accurately testing it. There is a fix so that it actually tests it properly in my downgrade tests PR here. If we think it's a good idea, I can port these changes and the similar changes made for windows over to that downgrade tests PR and verify that it's working properly.

@twangboy twangboy temporarily deployed to ci August 29, 2023 19:30 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 19:30 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 19:30 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 19:30 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 19:48 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 29, 2023 19:53 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 30, 2023 14:57 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 30, 2023 14:57 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 30, 2023 14:57 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 30, 2023 14:57 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 30, 2023 14:57 — with GitHub Actions Inactive
@twangboy twangboy temporarily deployed to ci August 30, 2023 14:57 — with GitHub Actions Inactive
@Ch3LL Ch3LL merged commit ff962f8 into saltstack:3006.x Aug 30, 2023
365 checks passed
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.

5 participants