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.

Sign up for GitHub

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

Jump to bottom

rpm: drop obsolete libs-compat metapackage #9757

Merged
merged 3 commits into from Aug 25, 2016
Merged

rpm: drop obsolete libs-compat metapackage #9757

merged 3 commits into from Aug 25, 2016

Conversation

smithfarm
Copy link
Contributor

@ktdreyer
Copy link
Member

Assuming this passes Gitbuilder, it looks fine to me. Is Teuthology ok with this change?

@smithfarm
Copy link
Contributor Author

Pushed wip-16353 to gitbuilders.

@smithfarm
Copy link
Contributor Author

Is Teuthology ok with this change?

Would a single run of upgrade/hammer-x on CentOS 7 be sufficient to verify that? That's how we verified #8938

@ktdreyer
Copy link
Member

Sure!

@smithfarm
Copy link
Contributor Author

gitbuilder likes it

@smithfarm
Copy link
Contributor Author

smithfarm commented Jun 17, 2016 •
edited

./virtualenv/bin/teuthology-suite --verbose --suite upgrade/hammer-x --suite-branch master --ceph wip-nathan-testing --machine-type vps --priority 101 --filter centos_7 --limit 1 machine_types/vps.yaml

(note that wip-nathan-testing branch includes both PRs #9744 and #9757)

fail http://pulpito.ceph.com/smithfarm-2016-06-17_02:15:26-upgrade:hammer-x-wip-nathan-testing---basic-vps/

@smithfarm
Copy link
Contributor Author

@ktdreyer Can you look at the teuthology failure? Maybe I need to add a Provides: for every Obsoletes: ?

@smithfarm
Copy link
Contributor Author

@ktdreyer Nevermind. I added a commit to #9744 and am re-testing.

@smithfarm
Copy link
Contributor Author

smithfarm commented Jun 17, 2016 •
edited

failed due to infrastructure issues http://pulpito.ceph.com/smithfarm-2016-06-17_12:21:29-upgrade:hammer-x-wip-nathan-testing---basic-vps/

@smithfarm
Copy link
Contributor Author

Changelog:

  • rebase

@smithfarm
Copy link
Contributor Author

smithfarm commented Jun 20, 2016 •
edited

fail because ceph-devel was still being installed on the test node http://pulpito.ceph.com/smithfarm-2016-06-20_00:38:21-upgrade:hammer-x-wip-nathan-testing---basic-vps/

@smithfarm
Copy link
Contributor Author

Will wait until #9744 is merged, then rebase, then test.

@smithfarm smithfarm force-pushed the wip-16353 branch 2 times, most recently from 6390bc0 to f61e243 Compare August 9, 2016 09:49
@smithfarm
Copy link
Contributor Author

@smithfarm
Copy link
Contributor Author

Hey Jenkins, test this please (146/146 Test #146: unittest_rbd_mirror .....................***Timeout 3600.05 sec)

@smithfarm
Copy link
Contributor Author

gitbuilder passed

@smithfarm
Copy link
Contributor Author

smithfarm commented Aug 9, 2016 •
edited

pass http://pulpito.ceph.com/smithfarm-2016-08-09_18:57:07-upgrade:jewel-x-wip-16353---basic-smithi/

@smithfarm
Copy link
Contributor Author

@ktdreyer @b-ranto Please review. I added two commits. It passes gitbuilder and the upgrade/jewel-x validation test.

@ktdreyer
Copy link
Member

ktdreyer commented Aug 9, 2016

That change was needed. Thank you.
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

@smithfarm smithfarm mentioned this pull request Aug 10, 2016
Merged
@b-ranto
Copy link
Contributor

b-ranto commented Aug 10, 2016

Why does this introduce devel-compat package? If we do indeed want to (re-)introduce it then it should also be mentioned in the commit message.

@smithfarm
Copy link
Contributor Author

@b-ranto Good catch! I got confused while trying to resolve the rebase conflicts. Should be good to go now, but I will re-test.

@smithfarm
Copy link
Contributor Author

Marking DNM pending merge of #10208.

@smithfarm smithfarm changed the title rpm: drop obsolete libs-compat and python-ceph-compat metapackages [DNM] rpm: drop obsolete libs-compat and python-ceph-compat metapackages Aug 10, 2016
@smithfarm smithfarm mentioned this pull request Aug 10, 2016
Merged
@smithfarm smithfarm force-pushed the wip-16353 branch 2 times, most recently from 974a391 to ef4cd5f Compare August 15, 2016 13:13
@smithfarm
Copy link
Contributor Author

@smithfarm smithfarm changed the title [DNM] rpm: drop obsolete libs-compat and python-ceph-compat metapackages rpm: drop obsolete libs-compat and python-ceph-compat metapackages Aug 15, 2016
@smithfarm
Copy link
Contributor Author

pass http://pulpito.front.sepia.ceph.com/smithfarm-2016-08-16_14:30:30-upgrade:jewel-x-wip-16353---basic-smithi/

@smithfarm
Copy link
Contributor Author

@ktdreyer Are you brave enough to merge this? ;-)

@smithfarm
Copy link
Contributor Author

The related teuthology mod - ceph/teuthology@4543fb64 - causes http://tracker.ceph.com/issues/17075

I think the tests themselves can be tweaked to overcome this.

@smithfarm
Copy link
Contributor Author

I wrote to ceph-devel mailing list. If we want to drop python-ceph-compat from rpm, we should probably drop python-ceph from deb, too.

@smithfarm smithfarm mentioned this pull request Aug 23, 2016
Merged
@smithfarm
rpm: drop obsolete libs-compat metapackage
644650f 
Fixes: http://tracker.ceph.com/issues/16353
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
ceph.spec.in: drop trouble-making divider comments
231b7ba 
We have some %post scriptlets that fire up a shell just to execute a single
command like this:

%postun -n librados2
/sbin/ldconfig

Normally, it would be possible to optimize these as:

%postun -n librados2 -p /sbin/ldconfig

Except that, due to an RPM bug, there must not be *any* content (not even comments)
between the %postun and the next section.

See https://bugzilla.redhat.com/show_bug.cgi?id=1003962#c0 for details.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
rpm: do not unnecessarily spawn shells for scriptlets
ddae82b 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm
Copy link
Contributor Author

  • dropped the commit that was dropping python-ceph-compat - we will carry this package as long as there are tests in ceph-qa-suite that install pre-hammer releases
  • rebased

@smithfarm
Copy link
Contributor Author

pass http://pulpito.front.sepia.ceph.com/smithfarm-2016-08-23_09:57:13-upgrade:jewel-x-wip-16353---basic-smithi/

@smithfarm
Copy link
Contributor Author

@ktdreyer I'm ready for this to be merged. What about you?

@ktdreyer
Copy link
Member

Let's do it

@ktdreyer ktdreyer merged commit ddae82b into ceph:master Aug 25, 2016
ktdreyer added a commit that referenced this pull request Aug 25, 2016
@ktdreyer
Merge pull request #9757 from SUSE/wip-16353
b0f9aaf 
rpm: drop obsolete libs-compat and python-ceph-compat metapackages

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
@ktdreyer ktdreyer changed the title rpm: drop obsolete libs-compat and python-ceph-compat metapackages rpm: drop obsolete libs-compat metapackage Aug 25, 2016
@smithfarm smithfarm deleted the wip-16353 branch August 25, 2016 21:47
@smithfarm smithfarm mentioned this pull request Aug 26, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ktdreyer ktdreyer

Labels
build/ops
Projects
None yet
Milestone
No milestone
3 participants
@smithfarm @ktdreyer @b-ranto