diff options
Diffstat (limited to 'app-admin/salt')
| -rw-r--r-- | app-admin/salt/Manifest | 1 | ||||
| -rw-r--r-- | app-admin/salt/files/salt-3000.1-tests.patch | 58 | ||||
| -rw-r--r-- | app-admin/salt/metadata.xml | 2 | ||||
| -rw-r--r-- | app-admin/salt/salt-3000.2.ebuild | 173 |
4 files changed, 234 insertions, 0 deletions
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index f5cc57ada94b..1e5653bb58c2 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -1,2 +1,3 @@ DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b DIST salt-2019.2.4.tar.gz 14572556 BLAKE2B a1057baa5ab6c0a07f34ce658a1d5bc644f968600663d28d084eb712b55faaee93b8410d81c4b5324944e6e1f2067ffb102200088832e1b0076fed78c8542ae6 SHA512 9e621cbd78ead1060a2b0c07e7ef02e8c4590360a95c51ac29fa8c1add34f617e4407dd28b67cae3b0fd68b333782185edcf1159edd2db08e8b4e79b6b07a63f +DIST salt-3000.2.tar.gz 15231513 BLAKE2B 2090d0f52f953a42f1685ad190750e9c76ad6e862a3272444fef063a7605f69a6c542f04165a41fb9cdaa126a878cc133d4857faa70edc5eac4bf49bdde937ab SHA512 88e8876ed8cd18e942c2194686cda68f40fa49e69e317ca488bf58e095bcf6cdf8771d93eba7960038941cc5863e13a4eea4dad5256c12da7cd8288a2c61f59d diff --git a/app-admin/salt/files/salt-3000.1-tests.patch b/app-admin/salt/files/salt-3000.1-tests.patch new file mode 100644 index 000000000000..12a2e7822b94 --- /dev/null +++ b/app-admin/salt/files/salt-3000.1-tests.patch @@ -0,0 +1,58 @@ +diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py +index e0d939a086..33a9b6dc35 100644 +--- a/tests/unit/fileserver/test_roots.py ++++ b/tests/unit/fileserver/test_roots.py +@@ -11,7 +11,7 @@ import tempfile + + # Import Salt Testing libs + from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin +-from tests.support.unit import TestCase ++from tests.support.unit import TestCase, skipIf + from tests.support.mock import patch + from tests.support.runtests import RUNTIME_VARS + +@@ -165,6 +165,7 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix + self.assertIn('empty_dir', ret) + self.assertIn(UNICODE_DIRNAME, ret) + ++ @skipIf(True, "doesn't like sandbox") + def test_symlink_list(self): + orig_file_roots = self.opts['file_roots'] + try: +diff --git a/tests/unit/modules/test_dockermod.py b/tests/unit/modules/test_dockermod.py +index 191bfc123f..1956127f0b 100644 +--- a/tests/unit/modules/test_dockermod.py ++++ b/tests/unit/modules/test_dockermod.py +@@ -793,6 +793,7 @@ class DockerTestCase(TestCase, LoaderModuleMockMixin): + }, + ret) + ++ @skipIf(True, "Doesn't work with sandbox") + def test_call_success(self): + ''' + test module calling inside containers +diff --git a/tests/unit/states/test_pip_state.py b/tests/unit/states/test_pip_state.py +index 13c158b309..27e10e6161 100644 +--- a/tests/unit/states/test_pip_state.py ++++ b/tests/unit/states/test_pip_state.py +@@ -384,6 +384,7 @@ class PipStateUtilsTest(TestCase): + + + @skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed') ++@skipIf(True, "Needs network access") + class PipStateInstallationErrorTest(TestCase): + + def test_importable_installation_error(self): +diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py +index f48fa9d42c..bb57929cfa 100644 +--- a/tests/unit/utils/test_jinja.py ++++ b/tests/unit/utils/test_jinja.py +@@ -1268,7 +1268,7 @@ class TestCustomExtensions(TestCase): + dict(opts=self.local_opts, saltenv='test', salt=self.local_salt)) + self.assertEqual(rendered, '16777216') + +- @flaky ++ @skipIf("True", "Needs network access") + def test_http_query(self): + ''' + Test the `http_query` Jinja filter. diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml index e27805465b7e..91b468848999 100644 --- a/app-admin/salt/metadata.xml +++ b/app-admin/salt/metadata.xml @@ -21,9 +21,11 @@ Between the remote execution system, and state management Salt addresses the backbone of cloud and data center management. </longdescription> <use> + <flag name="cheetah">Enable support for <pkg>dev-python/cheetah3</pkg></flag> <flag name="cherrypy">Enable support for using cherrypy.</flag> <flag name="libcloud">Enable salt-cloud support via libcloud.</flag> <flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag> + <flag name="genshi">Enable support for <pkg>dev-python/genshi</pkg></flag> <flag name="gnupg">Enable support for gnupg via python-gnupg.</flag> <flag name="keyring">Enable support for keyrings via python-keyring.</flag> <flag name="mako">Add support for using the mako template engine for parsing salt states.</flag> diff --git a/app-admin/salt/salt-3000.2.ebuild b/app-admin/salt/salt-3000.2.ebuild new file mode 100644 index 000000000000..376575e7ccf4 --- /dev/null +++ b/app-admin/salt/salt-3000.2.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_7 ) +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax" + +RDEPEND=" + sys-apps/pciutils + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.5[${PYTHON_USEDEP}] + <dev-python/msgpack-1.0[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7) + ) + openssl? ( + dev-libs/openssl:0=[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" + "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3000.1-tests.patch" +) + +python_prepare() { + # remove tests with external dependencies that may not be available + rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die + rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die + rm tests/unit/states/test_boto_vpc.py || die + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.py || die + + # allow the use of the renamed msgpack + sed -i '/^msgpack/d' requirements/base.txt || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + + ( + cleanup() { rm -f "${tempdir}" || die; } + + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die + + USE_SETUPTOOLS=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose \ + || die "testing failed with ${EPYTHON}" + ) +} + +pkg_postinst_disabled() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +} |