CYT-010 Keep default python version in travis checks

cytopia · Dec 25, 2017 · d56c3a5 · d56c3a5
1 parent 9ebbdb7
commit d56c3a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/Dockerfile.python2 b/Dockerfile.python2
@@ -60,16 +60,14 @@ RUN set -x \
 		\
 		echo "# ---- Pythonstrap ----"; \
 		echo "- hosts: all"; \
-		echo "  vars:"; \
-		echo "    python_default: 2"; \
 		echo "  roles:"; \
 		echo "    - python-meta"; \
 		\
 		echo "# ---- Pre-defined Roles ----"; \
 		for r in ${ROLES}; do \
 			echo "- hosts: all"; \
 			echo "  vars:"; \
-			echo "    - $(echo $r | sed 's/-/_/g'): 'install'"; \
+			echo "    $(echo $r | sed 's/-/_/g'): 'install'"; \
 			echo "  roles:"; \
 			echo "    - ${r}"; \
 			echo "  tags:"; \
@@ -95,7 +93,7 @@ RUN set -x \
 		for r in ${ROLES}; do \
 			echo "- hosts: all"; \
 			echo "  vars:"; \
-			echo "    - $(echo $r | sed 's/-/_/g'): 'remove'"; \
+			echo "    $(echo $r | sed 's/-/_/g'): 'remove'"; \
 			echo "  roles:"; \
 			echo "    - ${r}"; \
 			echo "  tags:"; \

diff --git a/Dockerfile.python3 b/Dockerfile.python3
@@ -60,16 +60,14 @@ RUN set -x \
 		\
 		echo "# ---- Pythonstrap ----"; \
 		echo "- hosts: all"; \
-		echo "  vars:"; \
-		echo "    python_default: 2"; \
 		echo "  roles:"; \
 		echo "    - python-meta"; \
 		\
 		echo "# ---- Pre-defined Roles ----"; \
 		for r in ${ROLES}; do \
 			echo "- hosts: all"; \
 			echo "  vars:"; \
-			echo "    - $(echo $r | sed 's/-/_/g'): 'install'"; \
+			echo "    $(echo $r | sed 's/-/_/g'): 'install'"; \
 			echo "  roles:"; \
 			echo "    - ${r}"; \
 			echo "  tags:"; \
@@ -95,7 +93,7 @@ RUN set -x \
 		for r in ${ROLES}; do \
 			echo "- hosts: all"; \
 			echo "  vars:"; \
-			echo "    - $(echo $r | sed 's/-/_/g'): 'remove'"; \
+			echo "    $(echo $r | sed 's/-/_/g'): 'remove'"; \
 			echo "  roles:"; \
 			echo "    - ${r}"; \
 			echo "  tags:"; \
@@ -130,10 +128,10 @@ RUN set -x \
 		echo "if ! set | grep '^extra=' >/dev/null 2>&1; then"; \
 		echo "    extra=\"\""; \
 		echo "fi"; \
-		echo "ansible-playbook -i inventory travis-ci-install.yml --limit \${MY_HOST} \${extra} --diff -v"; \
+		echo "ansible-playbook -i inventory travis-ci-install.yml --limit \${MY_HOST} \${extra} -e python_default=3 --diff -v"; \
 		echo "apt list --installed"; \
 		\
-		echo "ansible-playbook -i inventory travis-ci-remove.yml --limit \${MY_HOST} \${extra} --diff -v"; \
+		echo "ansible-playbook -i inventory travis-ci-remove.yml --limit \${MY_HOST} \${extra} -e python_default=3 --diff -v"; \
 		#echo "apt list --installed"; \
 	) > run-tests.sh \
 	&& chmod +x run-tests.sh