Skip to content

Commit

Permalink
fix README, use Makefile everywhere
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Miller <admiller@redhat.com>
  • Loading branch information
maxamillion committed Aug 26, 2020
1 parent 3885eb1 commit f9fc0f7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down Expand Up @@ -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:
Expand Down
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down

0 comments on commit f9fc0f7

Please sign in to comment.