svn commit: r470293 - in head: . sysutils/ansible sysutils/ansible1 sysutils/ansible23 sysutils/ansible24

[Nikolai Lifanov]

Author: lifanov
Date: Fri May 18 13:45:40 2018
New Revision: 470293
URL: https://svnweb.freebsd.org/changeset/ports/470293

Log:
  add tests and FLAVORS to Ansible ports
  
  Most of the work was done by koobs. Thank you!
  
  PR:		228268
  Submitted by:	koobs
  Reported by:	Christopher Hall

Modified:
  head/UPDATING
  head/sysutils/ansible/Makefile
  head/sysutils/ansible1/Makefile
  head/sysutils/ansible23/Makefile
  head/sysutils/ansible24/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri May 18 13:27:23 2018	(r470292)
+++ head/UPDATING	Fri May 18 13:45:40 2018	(r470293)
@@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20180518:
+  AFFECTS: users of sysutils/ansible*
+  AUTHOR: lifanov at FreeBSD.org
+
+  Ansible ports are now flavored. Package names for Ansible changed
+  to include python version. Poudriere and package users don't need
+  to do anything.
+
+  To rename an installed package to match the new naming scheme,
+  for example, for ansible24, run:
+
+   # pkg set -n ansible24:py27-ansible24
+  
 20180514:
   AFFECTS: users of www/gitlab
   AUTHOR: mfechner at FreeBSD.org

Modified: head/sysutils/ansible/Makefile
==============================================================================
--- head/sysutils/ansible/Makefile	Fri May 18 13:27:23 2018	(r470292)
+++ head/sysutils/ansible/Makefile	Fri May 18 13:45:40 2018	(r470293)
@@ -2,9 +2,10 @@
 
 PORTNAME=	ansible
 PORTVERSION?=	2.5.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://releases.ansible.com/ansible/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lifanov at FreeBSD.org
 COMMENT=	Radically simple IT automation
@@ -18,6 +19,14 @@ RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 
 CONFLICTS?=	ansible1-* ansible23-* ansible24-*
 
@@ -25,7 +34,7 @@ EXTRA_PATCHES?=	${FILESDIR}/extra-patch-sesu
 
 NO_ARCH=	yes
 USES?=		cpe python
-USE_PYTHON=	autoplist distutils noflavors
+USE_PYTHON=	distutils autoplist concurrent
 CPE_VENDOR=	ansibleworks
 
 SUB_FILES=	pkg-message
@@ -59,5 +68,12 @@ post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR}
+
+TEST_WRKSRC=${WRKSRC}/test
+
+do-test:
+#	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test sanity --python ${PYTHON_VER} -v
+	${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose
+	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test units --python ${PYTHON_VER} -v
 
 .include <bsd.port.mk>

Modified: head/sysutils/ansible1/Makefile
==============================================================================
--- head/sysutils/ansible1/Makefile	Fri May 18 13:27:23 2018	(r470292)
+++ head/sysutils/ansible1/Makefile	Fri May 18 13:45:40 2018	(r470293)
@@ -2,7 +2,7 @@
 
 PKGNAMESUFFIX=	1
 PORTVERSION=	1.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 
 CONFLICTS=	ansible-* ansible23-* ansible24-*
 

Modified: head/sysutils/ansible23/Makefile
==============================================================================
--- head/sysutils/ansible23/Makefile	Fri May 18 13:27:23 2018	(r470292)
+++ head/sysutils/ansible23/Makefile	Fri May 18 13:45:40 2018	(r470293)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTVERSION=	2.3.3.0
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	23
 
 CONFLICTS=	ansible-* ansible1-* ansible24-*

Modified: head/sysutils/ansible24/Makefile
==============================================================================
--- head/sysutils/ansible24/Makefile	Fri May 18 13:27:23 2018	(r470292)
+++ head/sysutils/ansible24/Makefile	Fri May 18 13:45:40 2018	(r470293)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTVERSION=	2.4.4.0
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	24
 
 CONFLICTS=	ansible-* ansible1-* ansible23-*