From f9fc0f7d69ec7223f35250a3c337cbb361a7d347 Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Wed, 26 Aug 2020 11:33:00 -0500
Subject: [PATCH] fix README, use Makefile everywhere

Signed-off-by: Adam Miller <admiller@redhat.com>
---
 .github/workflows/ci.yml | 6 +++---
 Makefile                 | 9 ++++++---
 README.md                | 5 -----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a11c9c59..370669af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
 
       - name: Run sanity tests on Python ${{ matrix.python_version }}
-        run: ansible-test sanity --docker -v --color --python ${{ matrix.python_version }}
+        run: make test-sanity PYTHON_VERSION=${{ matrix.python_version }}
         working-directory: ./ansible_collections/community/kubernetes
 
   integration:
@@ -53,7 +53,7 @@ jobs:
         run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
 
       - name: Run integration tests on Python ${{ matrix.python_version }}
-        run: ansible-test integration --docker -v --color --retry-on-error --python ${{ matrix.python_version }} --continue-on-error --diff --coverage
+        run: make test-integration PYTHON_VERSION=${{ matrix.python_version }}
         working-directory: ./ansible_collections/community/kubernetes
 
       - name: Generate coverage report.
@@ -106,7 +106,7 @@ jobs:
           ln -s /home/runner/work/kubernetes/kubernetes /home/runner/.ansible/collections
 
       - name: Run molecule default test scenario
-        run: molecule test
+        run: make test-molecule
         working-directory: ./ansible_collections/community/kubernetes
 
   downstream-sanity:
diff --git a/Makefile b/Makefile
index b1bb4b19..9dcd286f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 # Also needs to be updated in galaxy.yml
 VERSION = 1.0.0
 
+TEST_ARGS ?= ""
+PYTHON_VERSION ?= `python -c 'import platform; print("{0}.{1}".format(platform.python_version_tuple()[0], platform.python_version_tuple()[1]))'`
+
 clean:
 	rm -f community-kubernetes-${VERSION}.tar.gz
 	rm -rf ansible_collections
@@ -15,13 +18,13 @@ install: build
 	ansible-galaxy collection install -p ansible_collections community-kubernetes-${VERSION}.tar.gz
 
 test-sanity:
-	ansible-test sanity -v --docker --color $(TEST_ARGS)
+	ansible-test sanity --docker -v --color --python $(PYTHON_VERSION) $(TEST_ARGS)
 
 test-integration:
-	ansible-test integration --docker -v --color $(TEST_ARGS)
+	ansible-test integration --docker -v --color --retry-on-error --python $(PYTHON_VERSION) --continue-on-error --diff --coverage $(TEST_ARGS)
 
 test-molecule:
-	ansible-test integration --docker -v --color $(TEST_ARGS)
+	molecule test
 
 downstream-test-sanity: 
 	./utils/downstream.sh -s
diff --git a/README.md b/README.md
index 1d2f649d..e3d7c6b9 100644
--- a/README.md
+++ b/README.md
@@ -157,11 +157,6 @@ Releases are automatically built and pushed to Ansible Galaxy for any new tag. B
     1. Run `antsibull-changelog release`.
   1. Commit the changes and create a PR with the changes. Wait for tests to pass, then merge it once they have.
   1. Tag the version in Git and push to GitHub.
-  1. Run the following commands to build and release the new version on Galaxy:
-
-     ```
-     make release
-     ```
 
 After the version is published, verify it exists on the [Kubernetes Collection Galaxy page](https://galaxy.ansible.com/community/kubernetes).