From 9ff259c638702118d7bc69018bfbdd03eeb4aa6f Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 8 Oct 2020 15:35:42 -0500 Subject: [PATCH] Issue #254: Prepare for 1.1.0 release. (#257) * Issue #254: Add changelogs for 1.1.0. * Issue #254: Two of the changes are major. * Update CHANGELOG and galaxy tag version. * Issue #254: Document kubernetes.core release process. --- CHANGELOG.rst | 60 +++++++++++++++---- Makefile | 8 +-- README.md | 15 ++++- changelogs/changelog.yaml | 59 ++++++++++++++++++ .../fragments/180_raw_handle_exception.yml | 3 + changelogs/fragments/191_contributing.yml | 3 + .../fragments/192_helm-status-check-mode.yml | 3 + .../193_vault-kubeconfig-support.yml | 3 + changelogs/fragments/196_probot-stale-bot.yml | 3 + .../fragments/197_downstream-makefile.yml | 3 + .../208_set-connection-plugin-transport.yml | 3 + .../fragments/211_execution-env-meta.yml | 3 + .../fragments/223_refactor-module_utils.yml | 3 + .../224_handle-dynamicclient-exception.yml | 3 + ..._replace-kubernetesansiblemodule-class.yml | 3 + ...8_dont-mark-changed-if-diff-irrelevant.yml | 3 + .../fragments/229_helm-vault-support.yml | 3 + .../fragments/230_k8s-template-parameter.yml | 3 + .../fragments/231_k8sansiblemixin-module.yml | 3 + .../234_k8s-selfsubjectaccessreviews.yml | 3 + .../fragments/235_k8s_info-wait-support.yml | 3 + .../fragments/246_helm-appversion-check.yml | 3 + .../252_connection-plugin-fqcn-fix.yml | 3 + .../93_helm-multiple-values-files.yml | 3 + galaxy.yml | 2 +- utils/downstream.sh | 22 +++---- 26 files changed, 198 insertions(+), 28 deletions(-) create mode 100644 changelogs/fragments/180_raw_handle_exception.yml create mode 100644 changelogs/fragments/191_contributing.yml create mode 100644 changelogs/fragments/192_helm-status-check-mode.yml create mode 100644 changelogs/fragments/193_vault-kubeconfig-support.yml create mode 100644 changelogs/fragments/196_probot-stale-bot.yml create mode 100644 changelogs/fragments/197_downstream-makefile.yml create mode 100644 changelogs/fragments/208_set-connection-plugin-transport.yml create mode 100644 changelogs/fragments/211_execution-env-meta.yml create mode 100644 changelogs/fragments/223_refactor-module_utils.yml create mode 100644 changelogs/fragments/224_handle-dynamicclient-exception.yml create mode 100644 changelogs/fragments/227_replace-kubernetesansiblemodule-class.yml create mode 100644 changelogs/fragments/228_dont-mark-changed-if-diff-irrelevant.yml create mode 100644 changelogs/fragments/229_helm-vault-support.yml create mode 100644 changelogs/fragments/230_k8s-template-parameter.yml create mode 100644 changelogs/fragments/231_k8sansiblemixin-module.yml create mode 100644 changelogs/fragments/234_k8s-selfsubjectaccessreviews.yml create mode 100644 changelogs/fragments/235_k8s_info-wait-support.yml create mode 100644 changelogs/fragments/246_helm-appversion-check.yml create mode 100644 changelogs/fragments/252_connection-plugin-fqcn-fix.yml create mode 100644 changelogs/fragments/93_helm-multiple-values-files.yml diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6bcf4074..b88f0630 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,8 +5,48 @@ Kubernetes Collection Release Notes .. contents:: Topics -v1.0.0 (July 28 2020) -===================== +v1.1.0 +====== + +Major Changes +------------- + +- k8s - Add support for template parameter (https://github.com/ansible-collections/community.kubernetes/pull/230). +- k8s_* - Add support for vaulted kubeconfig and src (https://github.com/ansible-collections/community.kubernetes/pull/193). + +Minor Changes +------------- + +- Add Makefile and downstream build script for kubernetes.core (https://github.com/ansible-collections/community.kubernetes/pull/197). +- Add execution environment metadata (https://github.com/ansible-collections/community.kubernetes/pull/211). +- Add probot stale bot configuration to autoclose issues (https://github.com/ansible-collections/community.kubernetes/pull/196). +- Added a contribution guide (https://github.com/ansible-collections/community.kubernetes/pull/192). +- Refactor module_utils (https://github.com/ansible-collections/community.kubernetes/pull/223). +- Replace KubernetesAnsibleModule class with dummy class (https://github.com/ansible-collections/community.kubernetes/pull/227). +- Replace KubernetesRawModule class with K8sAnsibleMixin (https://github.com/ansible-collections/community.kubernetes/pull/231). +- common - Do not mark task as changed when diff is irrelevant (https://github.com/ansible-collections/community.kubernetes/pull/228). +- helm - Add appVersion idempotence check to Helm (https://github.com/ansible-collections/community.kubernetes/pull/246). +- helm - Return status in check mode (https://github.com/ansible-collections/community.kubernetes/pull/192). +- helm - Support for single or multiple values files (https://github.com/ansible-collections/community.kubernetes/pull/93). +- helm_* - Support vaulted kubeconfig (https://github.com/ansible-collections/community.kubernetes/pull/229). +- k8s - SelfSubjectAccessReviews supported when 405 response received (https://github.com/ansible-collections/community.kubernetes/pull/237). +- k8s - add testcase for adding multiple resources using template parameter (https://github.com/ansible-collections/community.kubernetes/issues/243). +- k8s_info - Add support for wait (https://github.com/ansible-collections/community.kubernetes/pull/235). +- k8s_info - update custom resource example (https://github.com/ansible-collections/community.kubernetes/issues/202). +- kubectl plugin - correct console log (https://github.com/ansible-collections/community.kubernetes/issues/200). +- raw - Handle exception raised by underlying APIs (https://github.com/ansible-collections/community.kubernetes/pull/180). + +Bugfixes +-------- + +- common - handle exception raised due to DynamicClient (https://github.com/ansible-collections/community.kubernetes/pull/224). +- helm - add replace parameter (https://github.com/ansible-collections/community.kubernetes/issues/106). +- k8s (inventory) - Set the connection plugin and transport separately (https://github.com/ansible-collections/community.kubernetes/pull/208). +- k8s (inventory) - Specify FQCN for k8s inventory plugin to fix use with Ansible 2.9 (https://github.com/ansible-collections/community.kubernetes/pull/250). +- k8s_info - add wait functionality (https://github.com/ansible-collections/community.kubernetes/issues/18). + +v1.0.0 +====== Major Changes ------------- @@ -47,8 +87,8 @@ New Modules - helm_plugin - Manage Helm plugins - helm_plugin_info - Gather information about Helm plugins -v0.11.1 (July 1 2020) -===================== +v0.11.1 +======= Major Changes ------------- @@ -86,8 +126,8 @@ Bugfixes - k8s_scale - Fix scale wait and add tests (https://github.com/ansible-collections/community.kubernetes/pull/100). - raw - handle condition when definition is none (https://github.com/ansible-collections/community.kubernetes/pull/139). -v0.11.0 (May 4 2020) -==================== +v0.11.0 +======= Major Changes ------------- @@ -115,8 +155,8 @@ New Modules - helm_info - Get information from Helm package deployed inside the cluster - helm_repository - Add and remove Helm repository -v0.10.0 (March 23 2020) -======================= +v0.10.0 +======= Major Changes ------------- @@ -149,8 +189,8 @@ New Modules - k8s_exec - Execute command in Pod - k8s_log - Fetch logs from Kubernetes resources -v0.9.0 (February 5 2020) -======================== +v0.9.0 +====== Major Changes ------------- diff --git a/Makefile b/Makefile index a6f0938c..0e07e105 100644 --- a/Makefile +++ b/Makefile @@ -27,16 +27,16 @@ test-integration: test-molecule: molecule test -downstream-test-sanity: +downstream-test-sanity: ./utils/downstream.sh -s -downstream-test-integration: +downstream-test-integration: ./utils/downstream.sh -i -downstream-test-molecule: +downstream-test-molecule: ./utils/downstream.sh -m -downstream-build: +downstream-build: ./utils/downstream.sh -b downstream-release: diff --git a/README.md b/README.md index 8546fdb7..bd1d5735 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CI](https://github.com/ansible-collections/community.kubernetes/workflows/CI/badge.svg?event=push)](https://github.com/ansible-collections/community.kubernetes/actions) [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/community.kubernetes)](https://codecov.io/gh/ansible-collections/community.kubernetes) -This repo hosts the `community.kubernetes` Ansible Collection. +This repo hosts the `community.kubernetes` (a.k.a. `kubernetes.core`) Ansible Collection. The collection includes a variety of Ansible content to help automate the management of applications in Kubernetes and OpenShift clusters, as well as the provisioning and maintenance of clusters themselves. @@ -48,7 +48,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible --- collections: - name: community.kubernetes - version: 1.0.0 + version: 1.1.0 ``` ### Installing the OpenShift Python Library @@ -158,9 +158,20 @@ 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. Manually build and release the `kubernetes.core` collection (see following section). After the version is published, verify it exists on the [Kubernetes Collection Galaxy page](https://galaxy.ansible.com/community/kubernetes). +### Publishing `kubernetes.core` + +Until the contents of repository are moved into a new `kubernetes.core` repository on GitHub, this repository is the source of both the `kubernetes.core` and `community.kubernetes` repositories on Ansible Galaxy. + +To publish the `kubernetes.core` collection on Ansible Galaxy, do the following: + + 1. Run `make downstream-release`. + +The process for uploading a supported release to Automation Hub is documented separately. + ## More Information For more information about Ansible's Kubernetes integration, join the `#ansible-kubernetes` channel on Freenode IRC, and browse the resources in the [Kubernetes Working Group](https://github.com/ansible/community/wiki/Kubernetes) Community wiki page. diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 65d8e949..437d5a7d 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -186,3 +186,62 @@ releases: name: helm_plugin_info namespace: '' release_date: '2020-07-28' + 1.1.0: + changes: + bugfixes: + - common - handle exception raised due to DynamicClient (https://github.com/ansible-collections/community.kubernetes/pull/224). + - helm - add replace parameter (https://github.com/ansible-collections/community.kubernetes/issues/106). + - k8s (inventory) - Set the connection plugin and transport separately (https://github.com/ansible-collections/community.kubernetes/pull/208). + - k8s (inventory) - Specify FQCN for k8s inventory plugin to fix use with Ansible + 2.9 (https://github.com/ansible-collections/community.kubernetes/pull/250). + - k8s_info - add wait functionality (https://github.com/ansible-collections/community.kubernetes/issues/18). + major_changes: + - k8s - Add support for template parameter (https://github.com/ansible-collections/community.kubernetes/pull/230). + - k8s_* - Add support for vaulted kubeconfig and src (https://github.com/ansible-collections/community.kubernetes/pull/193). + minor_changes: + - Add Makefile and downstream build script for kubernetes.core (https://github.com/ansible-collections/community.kubernetes/pull/197). + - Add execution environment metadata (https://github.com/ansible-collections/community.kubernetes/pull/211). + - Add probot stale bot configuration to autoclose issues (https://github.com/ansible-collections/community.kubernetes/pull/196). + - Added a contribution guide (https://github.com/ansible-collections/community.kubernetes/pull/192). + - Refactor module_utils (https://github.com/ansible-collections/community.kubernetes/pull/223). + - Replace KubernetesAnsibleModule class with dummy class (https://github.com/ansible-collections/community.kubernetes/pull/227). + - Replace KubernetesRawModule class with K8sAnsibleMixin (https://github.com/ansible-collections/community.kubernetes/pull/231). + - common - Do not mark task as changed when diff is irrelevant (https://github.com/ansible-collections/community.kubernetes/pull/228). + - helm - Add appVersion idempotence check to Helm (https://github.com/ansible-collections/community.kubernetes/pull/246). + - helm - Return status in check mode (https://github.com/ansible-collections/community.kubernetes/pull/192). + - helm - Support for single or multiple values files (https://github.com/ansible-collections/community.kubernetes/pull/93). + - helm_* - Support vaulted kubeconfig (https://github.com/ansible-collections/community.kubernetes/pull/229). + - k8s - SelfSubjectAccessReviews supported when 405 response received (https://github.com/ansible-collections/community.kubernetes/pull/237). + - k8s - add testcase for adding multiple resources using template parameter + (https://github.com/ansible-collections/community.kubernetes/issues/243). + - k8s_info - Add support for wait (https://github.com/ansible-collections/community.kubernetes/pull/235). + - k8s_info - update custom resource example (https://github.com/ansible-collections/community.kubernetes/issues/202). + - kubectl plugin - correct console log (https://github.com/ansible-collections/community.kubernetes/issues/200). + - raw - Handle exception raised by underlying APIs (https://github.com/ansible-collections/community.kubernetes/pull/180). + fragments: + - 106-helm_replace.yml + - 180_raw_handle_exception.yml + - 18_k8s_info_wait.yml + - 191_contributing.yml + - 192_helm-status-check-mode.yml + - 193_vault-kubeconfig-support.yml + - 196_probot-stale-bot.yml + - 197_downstream-makefile.yml + - 200_kubectl_fix.yml + - 202_k8s_info.yml + - 208_set-connection-plugin-transport.yml + - 211_execution-env-meta.yml + - 223_refactor-module_utils.yml + - 224_handle-dynamicclient-exception.yml + - 227_replace-kubernetesansiblemodule-class.yml + - 228_dont-mark-changed-if-diff-irrelevant.yml + - 229_helm-vault-support.yml + - 230_k8s-template-parameter.yml + - 231_k8sansiblemixin-module.yml + - 234_k8s-selfsubjectaccessreviews.yml + - 235_k8s_info-wait-support.yml + - 243_template.yml + - 246_helm-appversion-check.yml + - 252_connection-plugin-fqcn-fix.yml + - 93_helm-multiple-values-files.yml + release_date: '2020-10-08' diff --git a/changelogs/fragments/180_raw_handle_exception.yml b/changelogs/fragments/180_raw_handle_exception.yml new file mode 100644 index 00000000..6fb7d194 --- /dev/null +++ b/changelogs/fragments/180_raw_handle_exception.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - raw - Handle exception raised by underlying APIs (https://github.com/ansible-collections/community.kubernetes/pull/180). diff --git a/changelogs/fragments/191_contributing.yml b/changelogs/fragments/191_contributing.yml new file mode 100644 index 00000000..acb171d3 --- /dev/null +++ b/changelogs/fragments/191_contributing.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Added a contribution guide (https://github.com/ansible-collections/community.kubernetes/pull/192). diff --git a/changelogs/fragments/192_helm-status-check-mode.yml b/changelogs/fragments/192_helm-status-check-mode.yml new file mode 100644 index 00000000..96e403ae --- /dev/null +++ b/changelogs/fragments/192_helm-status-check-mode.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - helm - Return status in check mode (https://github.com/ansible-collections/community.kubernetes/pull/192). diff --git a/changelogs/fragments/193_vault-kubeconfig-support.yml b/changelogs/fragments/193_vault-kubeconfig-support.yml new file mode 100644 index 00000000..8843d1c0 --- /dev/null +++ b/changelogs/fragments/193_vault-kubeconfig-support.yml @@ -0,0 +1,3 @@ +--- +major_changes: + - k8s_* - Add support for vaulted kubeconfig and src (https://github.com/ansible-collections/community.kubernetes/pull/193). diff --git a/changelogs/fragments/196_probot-stale-bot.yml b/changelogs/fragments/196_probot-stale-bot.yml new file mode 100644 index 00000000..58808f46 --- /dev/null +++ b/changelogs/fragments/196_probot-stale-bot.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Add probot stale bot configuration to autoclose issues (https://github.com/ansible-collections/community.kubernetes/pull/196). diff --git a/changelogs/fragments/197_downstream-makefile.yml b/changelogs/fragments/197_downstream-makefile.yml new file mode 100644 index 00000000..9470fceb --- /dev/null +++ b/changelogs/fragments/197_downstream-makefile.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Add Makefile and downstream build script for kubernetes.core (https://github.com/ansible-collections/community.kubernetes/pull/197). diff --git a/changelogs/fragments/208_set-connection-plugin-transport.yml b/changelogs/fragments/208_set-connection-plugin-transport.yml new file mode 100644 index 00000000..56f17b86 --- /dev/null +++ b/changelogs/fragments/208_set-connection-plugin-transport.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - k8s (inventory) - Set the connection plugin and transport separately (https://github.com/ansible-collections/community.kubernetes/pull/208). diff --git a/changelogs/fragments/211_execution-env-meta.yml b/changelogs/fragments/211_execution-env-meta.yml new file mode 100644 index 00000000..996677ae --- /dev/null +++ b/changelogs/fragments/211_execution-env-meta.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Add execution environment metadata (https://github.com/ansible-collections/community.kubernetes/pull/211). diff --git a/changelogs/fragments/223_refactor-module_utils.yml b/changelogs/fragments/223_refactor-module_utils.yml new file mode 100644 index 00000000..3b8abc58 --- /dev/null +++ b/changelogs/fragments/223_refactor-module_utils.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Refactor module_utils (https://github.com/ansible-collections/community.kubernetes/pull/223). diff --git a/changelogs/fragments/224_handle-dynamicclient-exception.yml b/changelogs/fragments/224_handle-dynamicclient-exception.yml new file mode 100644 index 00000000..305bb9d5 --- /dev/null +++ b/changelogs/fragments/224_handle-dynamicclient-exception.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - common - handle exception raised due to DynamicClient (https://github.com/ansible-collections/community.kubernetes/pull/224). diff --git a/changelogs/fragments/227_replace-kubernetesansiblemodule-class.yml b/changelogs/fragments/227_replace-kubernetesansiblemodule-class.yml new file mode 100644 index 00000000..f492e7b9 --- /dev/null +++ b/changelogs/fragments/227_replace-kubernetesansiblemodule-class.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Replace KubernetesAnsibleModule class with dummy class (https://github.com/ansible-collections/community.kubernetes/pull/227). diff --git a/changelogs/fragments/228_dont-mark-changed-if-diff-irrelevant.yml b/changelogs/fragments/228_dont-mark-changed-if-diff-irrelevant.yml new file mode 100644 index 00000000..515a4be7 --- /dev/null +++ b/changelogs/fragments/228_dont-mark-changed-if-diff-irrelevant.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - common - Do not mark task as changed when diff is irrelevant (https://github.com/ansible-collections/community.kubernetes/pull/228). diff --git a/changelogs/fragments/229_helm-vault-support.yml b/changelogs/fragments/229_helm-vault-support.yml new file mode 100644 index 00000000..4400f3a1 --- /dev/null +++ b/changelogs/fragments/229_helm-vault-support.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - helm_* - Support vaulted kubeconfig (https://github.com/ansible-collections/community.kubernetes/pull/229). diff --git a/changelogs/fragments/230_k8s-template-parameter.yml b/changelogs/fragments/230_k8s-template-parameter.yml new file mode 100644 index 00000000..c7f48f2c --- /dev/null +++ b/changelogs/fragments/230_k8s-template-parameter.yml @@ -0,0 +1,3 @@ +--- +major_changes: + - k8s - Add support for template parameter (https://github.com/ansible-collections/community.kubernetes/pull/230). diff --git a/changelogs/fragments/231_k8sansiblemixin-module.yml b/changelogs/fragments/231_k8sansiblemixin-module.yml new file mode 100644 index 00000000..01700f01 --- /dev/null +++ b/changelogs/fragments/231_k8sansiblemixin-module.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Replace KubernetesRawModule class with K8sAnsibleMixin (https://github.com/ansible-collections/community.kubernetes/pull/231). diff --git a/changelogs/fragments/234_k8s-selfsubjectaccessreviews.yml b/changelogs/fragments/234_k8s-selfsubjectaccessreviews.yml new file mode 100644 index 00000000..91454fab --- /dev/null +++ b/changelogs/fragments/234_k8s-selfsubjectaccessreviews.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - k8s - SelfSubjectAccessReviews supported when 405 response received (https://github.com/ansible-collections/community.kubernetes/pull/237). diff --git a/changelogs/fragments/235_k8s_info-wait-support.yml b/changelogs/fragments/235_k8s_info-wait-support.yml new file mode 100644 index 00000000..ec60040c --- /dev/null +++ b/changelogs/fragments/235_k8s_info-wait-support.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - k8s_info - Add support for wait (https://github.com/ansible-collections/community.kubernetes/pull/235). diff --git a/changelogs/fragments/246_helm-appversion-check.yml b/changelogs/fragments/246_helm-appversion-check.yml new file mode 100644 index 00000000..7f87f20d --- /dev/null +++ b/changelogs/fragments/246_helm-appversion-check.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - helm - Add appVersion idempotence check to Helm (https://github.com/ansible-collections/community.kubernetes/pull/246). diff --git a/changelogs/fragments/252_connection-plugin-fqcn-fix.yml b/changelogs/fragments/252_connection-plugin-fqcn-fix.yml new file mode 100644 index 00000000..fd4a1419 --- /dev/null +++ b/changelogs/fragments/252_connection-plugin-fqcn-fix.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - k8s (inventory) - Specify FQCN for k8s inventory plugin to fix use with Ansible 2.9 (https://github.com/ansible-collections/community.kubernetes/pull/250). diff --git a/changelogs/fragments/93_helm-multiple-values-files.yml b/changelogs/fragments/93_helm-multiple-values-files.yml new file mode 100644 index 00000000..f6db35d6 --- /dev/null +++ b/changelogs/fragments/93_helm-multiple-values-files.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - helm - Support for single or multiple values files (https://github.com/ansible-collections/community.kubernetes/pull/93). diff --git a/galaxy.yml b/galaxy.yml index fbebf31b..93d57e1e 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -26,7 +26,7 @@ tags: - openshift - okd - cluster -version: 1.0.0 +version: 1.1.0 build_ignore: - .DS_Store - '*.tar.gz' diff --git a/utils/downstream.sh b/utils/downstream.sh index ce7d539a..eac38ba4 100755 --- a/utils/downstream.sh +++ b/utils/downstream.sh @@ -45,7 +45,7 @@ f_prep() molecule ) - # Temp build dir + # Temp build dir _tmp_dir=$(mktemp -d) _build_dir="${_tmp_dir}/ansible_collections/kubernetes/core" mkdir -p "${_build_dir}" @@ -167,10 +167,10 @@ f_release_option() { f_log_info "${FUNCNAME[0]}" f_common_steps - pushd "${_build_dir}" || return + pushd "${_build_dir}" || return f_log_info "RELEASE WD: ${PWD}" make release - popd || return + popd || return f_cleanup } @@ -179,10 +179,10 @@ f_build_option() { f_log_info "${FUNCNAME[0]}" f_common_steps - pushd "${_build_dir}" || return + pushd "${_build_dir}" || return f_log_info "BUILD WD: ${PWD}" make build - popd || return + popd || return f_copy_collection_to_working_dir f_cleanup } @@ -197,22 +197,22 @@ fi while getopts ":simrb" option do case $option in - s) + s) f_test_sanity_option ;; - i) + i) f_test_integration_option ;; - m) + m) f_test_molecule_option ;; - r) + r) f_release_option ;; - b) + b) f_build_option ;; - *) + *) printf "ERROR: Unimplemented option chosen.\n" f_show_help f_exit 1