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

octopus: ceph.spec.in: remove build directory at end of %install #45699

Open
wants to merge 2 commits into
base: octopus
Choose a base branch
from

Conversation

tserong
Copy link
Contributor

@tserong tserong commented Mar 30, 2022

backport tracker: https://tracker.ceph.com/issues/55099


backport of #45664
parent tracker: https://tracker.ceph.com/issues/55079

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

@tserong tserong added this to the octopus milestone Mar 30, 2022
@tserong
Copy link
Contributor Author

tserong commented Mar 30, 2022

That force push was just adding Conflicts info to the commit message

@tserong tserong marked this pull request as draft March 30, 2022 02:52
@tserong
Copy link
Contributor Author

tserong commented Apr 1, 2022

This also needs #45705

@tserong tserong marked this pull request as ready for review April 4, 2022 03:52
@tserong tserong requested a review from tchaikov April 6, 2022 04:15
@tserong
Copy link
Contributor Author

tserong commented Apr 28, 2022

jenkins test docs please

1 similar comment
@tserong
Copy link
Contributor Author

tserong commented May 2, 2022

jenkins test docs please

@tchaikov
Copy link
Contributor

tchaikov commented May 2, 2022

ImportError: cannot import name 'environmentfilter' from 'jinja2' (/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/jinja2/__init__.py)

Traceback (most recent call last):
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/bin/sphinx-build", line 5, in 
    from sphinx.cmd.build import main
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/sphinx/cmd/build.py", line 25, in 
    from sphinx.application import Sphinx
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/sphinx/application.py", line 43, in 
    from sphinx.registry import SphinxComponentRegistry
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/sphinx/registry.py", line 24, in 
    from sphinx.builders import Builder
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/sphinx/builders/__init__.py", line 26, in 
    from sphinx.util import import_object, logging, progress_message, rst, status_iterator
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/sphinx/util/rst.py", line 21, in 
    from jinja2 import Environment, environmentfilter
ImportError: cannot import name 'environmentfilter' from 'jinja2' (/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/jinja2/__init__.py)

hi Tim, the doc build failure should be addressed by #45972. before it is merged, i think we need to live with the build failure =(

@ljflores
Copy link
Contributor

ljflores commented May 9, 2022

jenkins retest this please

@tserong
Copy link
Contributor Author

tserong commented May 10, 2022

Rebased to pick up docs fix

@tserong
Copy link
Contributor Author

tserong commented May 10, 2022

Dammit, now it's failing API tests because "apache-libcloud 3.5.1 requires requests>=2.26.0, but you have requests 2.25.1 which is incompatible."

By the time we get to the end of the %install section, all the
built binaries have been installed in the build root, so we can
delete the build directory from the source tree.  This frees up
about 17GB of disk space on build hosts, which is helpful in
case other processes later in the RPM build need more disk space.

Fixes: https://tracker.ceph.com/issues/55079
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit aa18cb1)
Conflicts:
        ceph.spec.in
- octopus uses "build", not "%{_vpath_builddir}"
Removing the build directory at the end of %install is too soon,
and means we get rid of a bunch of stuff needed to correctly
create debuginfo/debugsource packages, which happens automatically
right after %install.  So, let's put it where it really belongs, in
the %clean section.

Fixes: aa18cb1
Fixes: https://tracker.ceph.com/issues/55079
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 94ad178)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants