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

cephadm-preflight: only use $basearch for IBM yum repo (backport #211) #215

Merged
merged 1 commit into from
Feb 21, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 20, 2023

This is an automatic backport of pull request #211 done by Mergify.
Cherry-pick of 0af37a9 has failed:

On branch mergify/bp/pacific/pr-211
Your branch is up to date with 'origin/pacific'.

You are currently cherry-picking commit 0af37a9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cephadm-preflight.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Feb 20, 2023
@ktdreyer
Copy link
Member

@andrewschoen would you mind resolving the conflicts here and force-pushing to mergify/bp/pacific/pr-211?

I think we should functionally test this before you tag v1.14.0, just to make sure everything's working as we expect. For example, I have questions about #207 I've never seen a $ character in a repository's name before.

@ktdreyer ktdreyer closed this Feb 20, 2023
@ktdreyer ktdreyer reopened this Feb 20, 2023
community should still use noarch and $basearch

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 0af37a9)
@andrewschoen
Copy link
Collaborator

@ktdreyer I would agree on some additional testing. There is some functional testing with this job, I'm not sure what all it covers though. https://2.jenkins.ceph.com/job/cephadm-ansible-prs-el8-functional/243/

@andrewschoen
Copy link
Collaborator

From those tests it doesn't look like $basearch is expanding into anything, it's being treated as a string.

changed: [ceph-node0] => (item=$basearch) => changed=true 
  ansible_loop_var: item
  attempts: 1
  item: $basearch
  repo: ceph_stable_$basearch
  state: present

@andrewschoen
Copy link
Collaborator

Later on it does expand though, you can see here from the ceph-common installation.

  ceph-common             x86_64  2:16.2.11-0.el8                      ceph_stable_x86_64   24 M

@andrewschoen andrewschoen merged commit d3b87c4 into pacific Feb 21, 2023
@andrewschoen andrewschoen deleted the mergify/bp/pacific/pr-211 branch February 21, 2023 17:19
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.

None yet

2 participants