fix README, use Makefile everywhere

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller
2020-08-26 11:33:00 -05:00
parent 3885eb1a84
commit f9fc0f7d69
3 changed files with 9 additions and 11 deletions

View File

@@ -30,7 +30,7 @@ jobs:
run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check 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 }} - 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 working-directory: ./ansible_collections/community/kubernetes
integration: integration:
@@ -53,7 +53,7 @@ jobs:
run: pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check 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 }} - 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 working-directory: ./ansible_collections/community/kubernetes
- name: Generate coverage report. - name: Generate coverage report.
@@ -106,7 +106,7 @@ jobs:
ln -s /home/runner/work/kubernetes/kubernetes /home/runner/.ansible/collections ln -s /home/runner/work/kubernetes/kubernetes /home/runner/.ansible/collections
- name: Run molecule default test scenario - name: Run molecule default test scenario
run: molecule test run: make test-molecule
working-directory: ./ansible_collections/community/kubernetes working-directory: ./ansible_collections/community/kubernetes
downstream-sanity: downstream-sanity:

View File

@@ -1,6 +1,9 @@
# Also needs to be updated in galaxy.yml # Also needs to be updated in galaxy.yml
VERSION = 1.0.0 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: clean:
rm -f community-kubernetes-${VERSION}.tar.gz rm -f community-kubernetes-${VERSION}.tar.gz
rm -rf ansible_collections rm -rf ansible_collections
@@ -15,13 +18,13 @@ install: build
ansible-galaxy collection install -p ansible_collections community-kubernetes-${VERSION}.tar.gz ansible-galaxy collection install -p ansible_collections community-kubernetes-${VERSION}.tar.gz
test-sanity: test-sanity:
ansible-test sanity -v --docker --color $(TEST_ARGS) ansible-test sanity --docker -v --color --python $(PYTHON_VERSION) $(TEST_ARGS)
test-integration: 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: test-molecule:
ansible-test integration --docker -v --color $(TEST_ARGS) molecule test
downstream-test-sanity: downstream-test-sanity:
./utils/downstream.sh -s ./utils/downstream.sh -s

View File

@@ -157,11 +157,6 @@ Releases are automatically built and pushed to Ansible Galaxy for any new tag. B
1. Run `antsibull-changelog release`. 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. 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. 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). After the version is published, verify it exists on the [Kubernetes Collection Galaxy page](https://galaxy.ansible.com/community/kubernetes).