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

packaging: make infernalis -> jewel upgrade work #8034

Merged
merged 1 commit into from Mar 11, 2016
Merged

Conversation

smithfarm
Copy link
Contributor

Attempts to install jewel ceph-common, ceph-mon, ceph-osd, and ceph-base
package over infernalis ceph package fail due to files existing in both.

See comment #4 in the tracker issue for a deeper analysis.

http://tracker.ceph.com/issues/15047 Fixes: #15047

Signed-off-by: Nathan Cutler ncutler@suse.com

@smithfarm smithfarm added this to the jewel milestone Mar 10, 2016
@smithfarm smithfarm changed the title debian: make infernalis -> jewel upgrade work DNM packaging: make infernalis -> jewel upgrade work Mar 10, 2016
@smithfarm
Copy link
Contributor Author

@ktdreyer @BRANTO1 This is untested. Could look it over first? There's probably something obvious I'm missing. When and if you think it's OK, I'll push the branch to gitbuilders and re-run the failing upgrade tests on it.

@ktdreyer
Copy link
Member

Did you see #7931 ?

@smithfarm
Copy link
Contributor Author

@ktdreyer Yes - I don't think it fixes the issue, though. Please read my analysis at http://tracker.ceph.com/issues/15047#note-4

@smithfarm
Copy link
Contributor Author

We could merge this PR into #7931 if that makes sense.

@ktdreyer
Copy link
Member

I think I see what you mean now. I'm ok with this, if it gets teuthology to pass. Are the RPM Conflicts/Obsoletes really necessary?

@smithfarm
Copy link
Contributor Author

Are the RPM Conflicts/Obsoletes really necessary?

I will prepare a branch without the RPM commit and test that first.

@smithfarm
Copy link
Contributor Author

pushed wip-15047-deb-only to gitbuilders

@@ -255,6 +255,8 @@ Requires: lsb-release
%if 0%{?fedora} || 0%{?rhel}
Requires: redhat-lsb-core
%endif
Conflicts: ceph < %{epoch}:10
Obsoletes: ceph < %{epoch}:10
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we need the Conflicts line here (and in all the other cases). The Conflicts line would probably only cause problems for us.

As for the Obsoletes line that does make sense, not sure if it is actually necessary though as this might already be covered by the tight 'Requires: <exact_version>' lines.

@smithfarm
Copy link
Contributor Author

Repushed the RPM patch with the following changes:

  1. removed all the Conflicts: lines
  2. removed Obsoletes: line from ceph-common
  3. added Obsoletes: line to ceph-mds
  4. revised the commit message

@smithfarm
Copy link
Contributor Author

Scheduled a full upgrade/infernalis-x suite on the deb-only integration branch:

smithfarm@teuthology:~/teuthology$ ./virtualenv/bin/teuthology-suite --verbose \
--priority 999 --suite upgrade/infernalis-x --suite-branch jewel --email ncutler@suse.cz \
--ceph wip-15047-deb-only --machine-type vps machine_types/vps.yaml

http://pulpito.ceph.com/smithfarm-2016-03-11_01:41:18-upgrade:infernalis-x-wip-15047-deb-only---basic-vps/

@smithfarm
Copy link
Contributor Author

@yuriw Can you check the teuthology command line in the previous comment? Hopefully I got it right . . .

@smithfarm
Copy link
Contributor Author

Test completed, logs of failed and dead jobs analyzed. Conclusions:

  1. the RPM commit is not needed because the issue does not manifest in RPM
  2. the DEB commit fixes this particular issue (failures are due to other issues)

@smithfarm smithfarm changed the title DNM packaging: make infernalis -> jewel upgrade work packaging: make infernalis -> jewel upgrade work Mar 11, 2016
@ktdreyer
Copy link
Member

Thanks @smithfarm . We can merge the debian commit, then.

Attempts to install jewel ceph-common, ceph-mon, ceph-osd, and ceph-base
package over infernalis ceph package fail due to files existing in both.

See comment #4 in the tracker issue for a deeper analysis.

http://tracker.ceph.com/issues/15047 Fixes: ceph#15047

Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
Copy link
Contributor Author

RPM commit dropped. Rebased on latest jewel.

@ktdreyer ktdreyer merged commit a230a38 into ceph:jewel Mar 11, 2016
ktdreyer added a commit that referenced this pull request Mar 11, 2016
packaging: make infernalis -> jewel upgrade work

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
@smithfarm smithfarm deleted the wip-15047 branch March 12, 2016 00:00
@ktdreyer
Copy link
Member

thanks for figuring this out!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants