1 |
commit: 9e459df66b5b581769bb4e2d8b786992cf9ccc44 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Thu Feb 28 02:12:09 2019 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 28 02:44:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e459df6 |
7 |
|
8 |
app-admin/salt: Version bump to 2019.2.0 |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
app-admin/salt/Manifest | 1 + |
15 |
app-admin/salt/files/salt-2019.2.0-tests.patch | 73 ++++++++++++ |
16 |
app-admin/salt/salt-2019.2.0.ebuild | 156 +++++++++++++++++++++++++ |
17 |
3 files changed, 230 insertions(+) |
18 |
|
19 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
20 |
index 1ade6a74b5a..1fb3702fea1 100644 |
21 |
--- a/app-admin/salt/Manifest |
22 |
+++ b/app-admin/salt/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST salt-2016.11.10.tar.gz 10058200 BLAKE2B 4b6a42f6bf56421bc19458686ec23a1f945ceeb68b4ce7059fde036ba98d677fc8b61cb0f0c6ab249304b2f07d1b0250f6b91e7c443e12868649bf88f4d44d43 SHA512 e767e2c4c20e3a49a748b2699e4c640610280c0ba1c5955d94daffc7c36991ee632f02a50e338c65b35da146e234c36cc732214174b9bc5cbd62316b9ee40c28 |
25 |
DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e490e35ec7f4895b68b444ff77f9e997321d73697f791d345756abf451f11891b5f78a97c537c35dfe8bd24c43bbc SHA512 1e5123ee3dc194a33cf5da1e68a0419230b2b4eea26e7f66bf2d64754f0dbef9012abfbd498015f6b675725e580d72abf13c151b106639597337498b1fd42238 |
26 |
DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b |
27 |
+DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca |
28 |
|
29 |
diff --git a/app-admin/salt/files/salt-2019.2.0-tests.patch b/app-admin/salt/files/salt-2019.2.0-tests.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..830fcbffe36 |
32 |
--- /dev/null |
33 |
+++ b/app-admin/salt/files/salt-2019.2.0-tests.patch |
34 |
@@ -0,0 +1,73 @@ |
35 |
+diff --git a/tests/unit/fileserver/test_gitfs.py b/tests/unit/fileserver/test_gitfs.py |
36 |
+index 4e93df4e62..38c13efb6b 100644 |
37 |
+--- a/tests/unit/fileserver/test_gitfs.py |
38 |
++++ b/tests/unit/fileserver/test_gitfs.py |
39 |
+@@ -151,6 +151,7 @@ class GitfsConfigTestCase(TestCase, LoaderModuleMockMixin): |
40 |
+ if exc.errno != errno.EEXIST: |
41 |
+ raise |
42 |
+ |
43 |
++ @skipIf(True, 'currently failing on Gentoo') |
44 |
+ def test_per_saltenv_config(self): |
45 |
+ opts_override = textwrap.dedent(''' |
46 |
+ gitfs_root: salt |
47 |
+diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py |
48 |
+index 445df0c98a..17ca123172 100644 |
49 |
+--- a/tests/unit/grains/test_core.py |
50 |
++++ b/tests/unit/grains/test_core.py |
51 |
+@@ -710,6 +710,7 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): |
52 |
+ ) |
53 |
+ |
54 |
+ @skipIf(not salt.utils.platform.is_linux(), 'System is not Linux') |
55 |
++ @skipIf(True, 'Test assumes running under Xen') |
56 |
+ def test_xen_virtual(self): |
57 |
+ ''' |
58 |
+ Test if OS grains are parsed correctly in Ubuntu Xenial Xerus |
59 |
+diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py |
60 |
+index 694a7aebfe..704f2d894f 100644 |
61 |
+--- a/tests/unit/utils/test_asynchronous.py |
62 |
++++ b/tests/unit/utils/test_asynchronous.py |
63 |
+@@ -3,6 +3,8 @@ |
64 |
+ # Import Python Libs |
65 |
+ from __future__ import absolute_import, print_function, unicode_literals |
66 |
+ |
67 |
++from unittest import skipIf |
68 |
++ |
69 |
+ # Import 3rd-party libs |
70 |
+ import tornado.testing |
71 |
+ import tornado.gen |
72 |
+@@ -35,6 +37,7 @@ class HelperB(object): |
73 |
+ |
74 |
+ |
75 |
+ class TestSyncWrapper(AsyncTestCase): |
76 |
++ @skipIf(True, "fails in sandbox") |
77 |
+ @tornado.testing.gen_test |
78 |
+ def test_helpers(self): |
79 |
+ ''' |
80 |
+@@ -56,6 +59,7 @@ class TestSyncWrapper(AsyncTestCase): |
81 |
+ ret = sync.sleep() |
82 |
+ self.assertTrue(ret) |
83 |
+ |
84 |
++ @skipIf(True, "fails in sandbox") |
85 |
+ def test_double(self): |
86 |
+ ''' |
87 |
+ Test when the asynchronous wrapper object itself creates a wrap of another thing |
88 |
+@@ -67,6 +71,7 @@ class TestSyncWrapper(AsyncTestCase): |
89 |
+ ret = sync.sleep() |
90 |
+ self.assertFalse(ret) |
91 |
+ |
92 |
++ @skipIf(True, "fails in sandbox") |
93 |
+ def test_double_sameloop(self): |
94 |
+ ''' |
95 |
+ Test asynchronous wrappers initiated from the same IOLoop, to ensure that |
96 |
+diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py |
97 |
+index da666ef4c7..e3523049b7 100644 |
98 |
+--- a/tests/unit/utils/test_jinja.py |
99 |
++++ b/tests/unit/utils/test_jinja.py |
100 |
+@@ -1102,6 +1102,7 @@ class TestCustomExtensions(TestCase): |
101 |
+ dict(opts=self.local_opts, saltenv='test', salt=self.local_salt)) |
102 |
+ self.assertEqual(rendered, '16777216') |
103 |
+ |
104 |
++ @skipIf(True, 'Skipping tests that require internet access') |
105 |
+ @flaky |
106 |
+ def test_http_query(self): |
107 |
+ ''' |
108 |
|
109 |
diff --git a/app-admin/salt/salt-2019.2.0.ebuild b/app-admin/salt/salt-2019.2.0.ebuild |
110 |
new file mode 100644 |
111 |
index 00000000000..7e76a85aeea |
112 |
--- /dev/null |
113 |
+++ b/app-admin/salt/salt-2019.2.0.ebuild |
114 |
@@ -0,0 +1,156 @@ |
115 |
+# Copyright 1999-2019 Gentoo Authors |
116 |
+# Distributed under the terms of the GNU General Public License v2 |
117 |
+ |
118 |
+EAPI=7 |
119 |
+PYTHON_COMPAT=( python2_7 python3_6 ) |
120 |
+ |
121 |
+inherit eutils systemd distutils-r1 |
122 |
+ |
123 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
124 |
+HOMEPAGE="http://saltstack.org/" |
125 |
+ |
126 |
+if [[ ${PV} == 9999* ]]; then |
127 |
+ inherit git-r3 |
128 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
129 |
+ EGIT_BRANCH="develop" |
130 |
+ SRC_URI="" |
131 |
+ KEYWORDS="" |
132 |
+else |
133 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
134 |
+ KEYWORDS="~amd64 ~x86" |
135 |
+fi |
136 |
+ |
137 |
+LICENSE="Apache-2.0" |
138 |
+SLOT="0" |
139 |
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
140 |
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
141 |
+ |
142 |
+RDEPEND="sys-apps/pciutils |
143 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
144 |
+ dev-python/libnacl[${PYTHON_USEDEP}] |
145 |
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
146 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
147 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
148 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
149 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
150 |
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
151 |
+ <www-servers/tornado-5.0[${PYTHON_USEDEP}] |
152 |
+ virtual/python-futures[${PYTHON_USEDEP}] |
153 |
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
154 |
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
155 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
156 |
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
157 |
+ openssl? ( |
158 |
+ dev-libs/openssl:0=[-bindist] |
159 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
160 |
+ ) |
161 |
+ raet? ( |
162 |
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
163 |
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
164 |
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
165 |
+ ) |
166 |
+ zeromq? ( |
167 |
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
168 |
+ dev-python/pycryptodome[${PYTHON_USEDEP}] |
169 |
+ ) |
170 |
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
171 |
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
172 |
+ portage? ( |
173 |
+ || ( |
174 |
+ sys-apps/portage[${PYTHON_USEDEP}] |
175 |
+ sys-apps/portage-mgorny[${PYTHON_USEDEP}] |
176 |
+ ) |
177 |
+ ) |
178 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
179 |
+ mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] ) |
180 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
181 |
+ selinux? ( sec-policy/selinux-salt ) |
182 |
+ timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] ) |
183 |
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
184 |
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
185 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
186 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
187 |
+ vim-syntax? ( app-vim/salt-vim )" |
188 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
189 |
+ test? ( |
190 |
+ >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] |
191 |
+ dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
192 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
193 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
194 |
+ dev-python/pytest-catchlog[${PYTHON_USEDEP}] |
195 |
+ dev-python/pip[${PYTHON_USEDEP}] |
196 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
197 |
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
198 |
+ dev-python/timelib[$(python_gen_usedep 'python2*')] |
199 |
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
200 |
+ !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) |
201 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
202 |
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
203 |
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
204 |
+ ${RDEPEND} |
205 |
+ )" |
206 |
+ |
207 |
+DOCS=( README.rst AUTHORS ) |
208 |
+ |
209 |
+REQUIRED_USE="|| ( raet zeromq )" |
210 |
+RESTRICT="x86? ( test )" |
211 |
+ |
212 |
+PATCHES=( |
213 |
+ "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" |
214 |
+ "${FILESDIR}/${PN}-2019.2.0-tests.patch" |
215 |
+ "${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch" |
216 |
+) |
217 |
+ |
218 |
+python_prepare() { |
219 |
+ # remove tests with external dependencies that may not be available |
220 |
+ rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die |
221 |
+ rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
222 |
+ rm tests/unit/states/test_boto_vpc.py || die |
223 |
+ rm tests/unit/modules/test_{kubernetes,vsphere}.py || die |
224 |
+ |
225 |
+ # allow the use of the renamed msgpack |
226 |
+ sed -i '/^msgpack/d' requirements/base.txt || die |
227 |
+} |
228 |
+ |
229 |
+python_install_all() { |
230 |
+ local svc |
231 |
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all |
232 |
+ |
233 |
+ for svc in minion master syndic api; do |
234 |
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
235 |
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
236 |
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service |
237 |
+ done |
238 |
+ |
239 |
+ insinto /etc/${PN} |
240 |
+ doins -r conf/* |
241 |
+} |
242 |
+ |
243 |
+python_test() { |
244 |
+ local tempdir |
245 |
+ # testsuite likes lots of files |
246 |
+ ulimit -n 3072 || die |
247 |
+ |
248 |
+ # ${T} is too long a path for the tests to work |
249 |
+ tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
250 |
+ mkdir "${T}/$(basename "${tempdir}")" |
251 |
+ mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
252 |
+ |
253 |
+ ( |
254 |
+ cleanup() { |
255 |
+ rm -f "${tempdir}" |
256 |
+ rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
257 |
+ } |
258 |
+ |
259 |
+ trap cleanup EXIT |
260 |
+ |
261 |
+ addwrite "${tempdir}" |
262 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
263 |
+ |
264 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
265 |
+ TMPDIR="${tempdir}" \ |
266 |
+ ${EPYTHON} tests/runtests.py \ |
267 |
+ --unit-tests --no-report --verbose |
268 |
+ |
269 |
+ ) || die "testing failed" |
270 |
+} |