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

mimic: build/ops: backport miscellaneous install-deps.sh and ceph.spec.in fixes from master #30718

Merged
merged 20 commits into from Oct 7, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Oct 4, 2019

mimic counterpart to #30708

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


backport of #30557
parent tracker: https://tracker.ceph.com/issues/42023

zmc and others added 19 commits Feb 1, 2019
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit a1a3e79)

Conflicts:
	install-deps.sh
otherwise, if we update *requirements.txt, and the wheelhouse fails to
offer the newly added dependency, the setup-virtualenv.sh will fail the
build.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ed0ca70)
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
(cherry picked from commit f92f256)
Signed-off-by: Tomasz Setkowski <tom@ai-traders.com>
(cherry picked from commit 0d8d0cf)
in some case, the $builddepcmd will failed without any "error:" output.
so we should check the exit status to handle it.

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
(cherry picked from commit 46e33d1)
we are running into following error recently

gpg: requesting key BA9EF27F from hkp server keyserver.ubuntu.com
gpgkeys: key 1E9377A2BA9EF27F can't be retrieved
gpg: no valid OpenPGP data found.
gpg: Total number processed: 0
gpg: keyserver communications error: keyserver helper general error
gpg: keyserver communications error: unknown pubkey algorithm
gpg: keyserver receive failed: unknown pubkey algorithm

so use the local copy of the pubkey instead

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b94e379)
The $() form is preferable to `` because folks (like me) might be using
` as a keyboard shortcut to GNU Screen, causing havoc to ensue whenever
copy-pasting the ` character.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e0042dd)
per apt.conf(5), and
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550564,
"Acquire::Translation" is not documented and will be deprecated. it
would be better to use "Acquire::Languages" solely. and it's consistent
with ceph/ceph-build#1137 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3911a7c)
Running `npm install` for the dashboard pulls dependenies with git.
Under some setups, git was not installed when building the frontend.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d8de543)
this should address the failures when running install-deps.sh, like

Downloading/unpacking virtualenv
  Running setup.py egg_info for package virtualenv
    /usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown
distribution option: 'python_requires'
      warnings.warn(msg)
    error in virtualenv setup command: 'extras_require' must be a
dictionary whose values are strings or lists of strings containing valid
project/version requirement specifiers.
    Complete output from command python setup.py egg_info:
    /usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown
distribution option: 'python_requires'

  warnings.warn(msg)

error in virtualenv setup command: 'extras_require' must be a dictionary
whose values are strings or lists of strings containing valid
project/version requirement specifiers.

this only happens on very old virtualenv shipped with RHEL7.4

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 9538675)
On ubuntu 18.04, "gcc -dumpversion" output "7", it result in
that below check will return false:
    dpkg --compare-versions 7 ge 7.0
Then, this script will install other gcc.

Actully, the full gcc version "gcc -dumpfullversion" output is
"7.3.0", than below check will turn true:
    dpkg --compare-version 7.3.0 ge 7.0
So, there's no need to install other gcc.

In case of hitting error on ubuntu16.04, use below parameter:
   gcc -dumpfullversion -dumpversion

Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
(cherry picked from commit ab7344e)
as centos-sclo-rh-source leads us to 404 at this moment. and we are not
using the source repo for building ceph. so we can just skip any
unavailable repo.

Fixes: http://tracker.ceph.com/issues/37707
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit aa2b9e9)
this change reverts "install-deps.sh: workaround setuptools' dependency on six"

This reverts commit 30ce5e5.

tl;dr: this change addresses the failures of "make check" runs on arm64
builders when they try to build `mgr-dashboard-test-venv` target.

long story: without this change, we will fail to pull in
setuptools >= 36, and as a result pip will fail to import
`setuptools.build_meta` in `pip/_vendor/pep517/_in_process.py`. and will
a `BackendUnavailable` exception thrown by `_call_hook()` in
`pip/_vendor/pep517/wrappers.py`. since the issue addressed by 30ce5e5
has been addressed since setuptools >= 36.0.1, we should be safe to
upgrade to the latest setuptools now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8b55b47)
this function will uncomment necessary dependencies on demand.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4fd1796)

Conflicts:
	install-deps.sh
Fixes: https://tracker.ceph.com/issues/42023
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 49d7401)
there is chance that the system already have epel-release-latest-7.noarch.rpm
installed, in that case, install-deps.sh should not fail.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 45a4173)
do_cmake.sh tests for Cython module version in python2

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 6de7111)

Conflicts:
	ceph.spec.in
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0b79741)

Conflicts:
	ceph.spec.in
`python3_pkgversion` is now defined as 3, while we don't have packages
like python3-Cython yet in EPEL7. but we do have `python36-Cython`. so
let's use `python3_version_nodots` instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 6d2f668)
@smithfarm smithfarm added the build/ops label Oct 4, 2019
@smithfarm smithfarm added this to the mimic milestone Oct 4, 2019
@smithfarm smithfarm requested a review from tchaikov Oct 4, 2019
@smithfarm smithfarm changed the title build/ops: backport miscellaneous install-dep.sh and ceph.spec.in fixes from master build/ops: backport miscellaneous install-deps.sh and ceph.spec.in fixes from master Oct 4, 2019
Fedora distros do not have python3?-Cython packages, but they do have
python3-Cython ones. Fix the BuildRequires so that we only use the
python3_version_nodots based version string for RHEL.

Fixes: https://tracker.ceph.com/issues/42032
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 40c5a18)
@smithfarm smithfarm force-pushed the smithfarm:wip-epel-release-snafu-mimic branch from 0990c31 to 1207536 Oct 4, 2019
@smithfarm smithfarm changed the title build/ops: backport miscellaneous install-deps.sh and ceph.spec.in fixes from master mimic: build/ops: backport miscellaneous install-deps.sh and ceph.spec.in fixes from master Oct 4, 2019
Copy link
Contributor

tchaikov left a comment

thanks, Nathan!

@smithfarm smithfarm requested a review from yuriw Oct 4, 2019
@yuriw
yuriw approved these changes Oct 4, 2019
@yuriw

This comment has been minimized.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 4, 2019

@yuriw yuriw merged commit cf6b30e into ceph:mimic Oct 7, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm deleted the smithfarm:wip-epel-release-snafu-mimic branch Oct 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.