Development
This section only needs to be read by developers of this project. People that want to make a fix or develop some extension, and people that want to test the project are also considered developers for the purpose of this section.
Repository
The repository for the IBM Z HMC collection is on GitHub:
Setting up the development environment
The development environment is pretty easy to set up.
Besides having a supported operating system with a supported Python version (see Supported environments), it is recommended that you set up a virtual Python environment.
Then, with a virtual Python environment active, clone the Git repo of this
project and prepare the development environment with make develop
:
$ git clone git@github.com:zhmcclient/zhmc-ansible-modules.git
$ cd zhmc-ansible-modules
$ make develop
This will install all prerequisites the project needs for its development.
Generally, this project uses Make to do things in the currently active
Python environment. The command make help
(or just make
) displays a
list of valid Make targets and a short description of what each target does.
Building the documentation
The documentation for the IBM Z HMC collection is published on GitHub Pages at https://zhmcclient.github.io/zhmc-ansible-modules/.
That web site represents a defined set of versions of this collection and
automatically gets updated whenever a pull request gets merged into the
repository branch that corresponds to the version. The automatic update
mechanism is implemented in the GitHub Actions workflow file
.github/workflows/docs.yml
.
The versions to be represented on that site are defined in docs/source/conf.py
in the section for “sphinx-versioning”.
In order to build this “versioned” documentation locally, issue:
$ make docs
The top-level document to open with a web browser will be
docs_build/index.html
. Note that the versioned documentation is built from
the defined branches, so it does not include the content of your Git work
directory.
In order to see the effects of some change in your Git work directory, there is a second documentation build that builds an “unversioned” documentation from the content of your Git work directory:
$ make docslocal
The top-level document to open with a web browser will be
docs_local/index.html
; it is opened automatically when the documentation
has been built successfully.
Testing
Again, an invocation of Make runs against the currently active Python environment.
There are four kinds of tests currently, available as make targets:
make linkcheck
- Check links in documentationmake test
- Run unit and function tests with test coveragemake sanity
- Run Ansible sanity tests (includes flake8, pylint, validate-modules)make end2end
- Run end2end tests (against a real environment)
For the unit and function tests, the testcases and options for pytest
can be specified via the environment variable TESTOPTS
, as shown in these
examples:
$ make test # Run all unit and function tests
$ TESTOPTS='-vv' make test # Specify -vv verbosity for pytest
$ TESTOPTS='-k test_partition.py' make test # Run only this test source file
Releasing a version
This section shows the steps for releasing a version to Ansible Galaxy.
It covers all variants of versions that can be released:
Releasing the master branch as a new major or minor version (M+1.0.0 or M.N+1.0)
Releasing a stable branch as a new update version (M.N.U+1)
This description assumes that you are authorized to push to the upstream repo
at https://github.com/zhmcclient/zhmc-ansible-modules and that the upstream repo
has the remote name origin
in your local clone.
Switch to your work directory of your local clone of the zhmc-ansible-modules Git repo and perform the following steps in that directory.
Set shell variables for the version and branch to be released:
MNU
- Full version number M.N.U this release should haveMN
- Major and minor version numbers M.N of that full versionBRANCH
- Name of the branch to be released
When releasing the master branch (e.g. as version
1.0.0
):MNU=1.0.0 MN=1.0 BRANCH=master
When releasing a stable branch (e.g. as version
0.8.1
):MNU=0.8.1 MN=0.8 BRANCH=stable_${MN}
Check out the branch to be released, make sure it is up to date with upstream, and create a topic branch for the version to be released:
git status # Double check the work directory is clean git checkout ${BRANCH} git pull git checkout -b release_${MNU}
Edit the change log:
vi docs/source/release_notes.rst
and make the following changes in the section of the version to be released:
Finalize the version to the version to be released.
Change the release date to today’s date.
Make sure that all changes are described.
Make sure the items shown in the change log are relevant for and understandable by users.
In the “Known issues” list item, remove the link to the issue tracker and add text for any known issues you want users to know about.
Remove all empty list items in the section of the version to be released.
Edit the Galaxy metadata file:
vi galaxy.yml
and set the ‘version’ parameter to the version to be released:
version: M.N.U
Edit the Sphinx config file:
vi docs/source/conf.py
and in the
scv_whitelist_tags
property, add the version to be released:scv_whitelist_tags = [ ..., 'M.N.U' ]
If you are releasing the master branch, in addition increase the version of the stable branch in the
scv_whitelist_branches
property to be the new stable version:scv_whitelist_branches = ('master', 'stable_M.N')
Edit the GitHub workflow file test.yml:
vi .github/workflows/test.yml
and in the on section, increase the version of the stable branch to be the new stable version:
on: schedule: . . . push: branches: [ master, stable_M.N ] pull_request: branches: [ master, stable_M.N ]
Edit the GitHub workflow file docs.yml:
vi .github/workflows/docs.yml
and in the on section, increase the version of the stable branch to be the new stable version:
on: push: # PR merge to these branches triggers this workflow branches: [ master, stable_M.N ]
Commit your changes and push them upstream:
git status # Double check the changed files git commit -asm "Release ${MNU}" git push --set-upstream origin release_${MNU}
On GitHub, create a Pull Request for branch
release_M.N.U
. This will trigger the CI runs.Important: When creating Pull Requests, GitHub by default targets the
master
branch. If you are releasing a stable branch, you need to change the target branch of the Pull Request tostable_M.N
.On GitHub, close milestone
M.N.U
.Perform a complete test in your preferred Python environment:
make clobber all
This should not fail because the same tests have already been run in the CI. However, run it for additional safety before the release.
If this test fails, fix any issues (with new commits) until the test succeeds.
On GitHub, once the checks for this Pull Request succeed:
Merge the Pull Request (no review is needed).
Delete the branch of the Pull Request (
release_M.N.U
)
Checkout the branch you are releasing, update it from upstream, and delete the local topic branch you created:
git checkout ${BRANCH} git pull git branch -d release_${MNU}
Tag the version:
Create a tag for the new version and push the tag addition upstream:
git tag -f ${MNU} git push -f --tags
On GitHub, edit the new tag
M.N.U
, and create a release description on it. This will cause it to appear in the Release tab.You can see the tags in GitHub via Code -> Releases -> Tags.
Publish the collection to Ansible Galaxy:
You need to be registered on Ansible Galaxy, and your userid there needs to be authorized to modify the ‘ibm’ namespace.
Look up your API Key on https://galaxy.ansible.com/me/preferences and upload to galaxy while the GALAXY_TOKEN environment variable is set to your API Key:
GALAXY_TOKEN={your-galaxy-api-key} make upload
This will show the collection version and will ask for confirmation.
Important: Double check that the correct package version (
M.N.U
, without any development suffix) is shown.Attention!! This only works once for each version. You cannot re-release the same version to Ansible Galaxy, or otherwise update it.
Verify that the released version arrived on Ansible Galaxy at https://galaxy.ansible.com/ibm/ibm_zhmc/
If you released the master branch, it needs a new fix stream.
Create a branch for its fix stream and push it upstream:
git checkout -b stable_${MN} git push --set-upstream origin stable_${MN}
Starting a new version
This section shows the steps for starting development of a new version.
These steps may be performed right after the steps for Releasing a version, or independently.
This section covers all variants of new versions:
A new major or minor version for new development based upon the master branch.
A new update (=fix) version based on a stable branch.
This description assumes that you are authorized to push to the upstream repo
at https://github.com/zhmcclient/zhmc-ansible-modules and that the upstream repo
has the remote name origin
in your local clone.
Switch to your work directory of your local clone of the zhmc-ansible-modules Git repo and perform the following steps in that directory.
Set shell variables for the version to be started and its base branch:
MNU
- Full version number M.N.U of the new version to be startedMN
- Major and minor version numbers M.N of that full versionBRANCH
- Name of the branch the new version is based upon
When starting a (major or minor) version (e.g.
1.1.0
) based on the master branch:MNU=1.1.0 MN=1.0 BRANCH=master
When starting an update (=fix) version (e.g.
0.8.2
) based on a stable branch:MNU=0.8.2 MN=0.8 BRANCH=stable_${MN}
Check out the branch the new version is based on, make sure it is up to date with upstream, and create a topic branch for the new version:
git status # Double check the work directory is clean git checkout ${BRANCH} git pull git checkout -b start_${MNU}
Edit the change log:
vi docs/source/release_notes.rst
and insert the following section before the top-most section, and update the version to the new version:
Version M.N.U-dev1 ------------------ This version contains all fixes up to version M.N-1.x. Released: not yet **Incompatible changes:** **Deprecations:** **Bug fixes:** **Enhancements:** **Cleanup:** **Known issues:** * See `list of open issues`_. .. _`list of open issues`: https://github.com/zhmcclient/zhmc-ansible-modules/issues
Edit the Galaxy metadata file:
vi galaxy.yml
and update the version to the new draft version:
version: M.N.U-dev1
Note: The version must follow the rules for semantic versioning 2.0 including the description of development/alpha/etc suffixes, as described in https://semver.org/
Commit your changes and push them upstream:
git status # Double check the changed files git commit -asm "Start ${MNU}" git push --set-upstream origin start_${MNU}
On GitHub, create a Pull Request for branch
start_M.N.U
.Important: When creating Pull Requests, GitHub by default targets the
master
branch. If you are starting based on a stable branch, you need to change the target branch of the Pull Request tostable_M.N
.On GitHub, create a milestone for the new version
M.N.U
.You can create a milestone in GitHub via Issues -> Milestones -> New Milestone.
On GitHub, go through all open issues and pull requests that still have milestones for previous releases set, and either set them to the new milestone, or to have no milestone.
On GitHub, once the checks for this Pull Request succeed:
Merge the Pull Request (no review is needed)
Delete the branch of the Pull Request (
start_M.N.U
)
Checkout the branch the new version is based on, update it from upstream, and delete the local topic branch you created:
git checkout ${BRANCH} git pull git branch -d start_${MNU}