nagios-charmers team mailing list archive

[Giuseppe Petralia <giuseppe.petralia@xxxxxxxxxxxxx>]

Review: Needs Fixing

Comments inline

Diff comments:

> diff --git a/.gitignore b/.gitignore
> index e650362..fea92c1 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -6,3 +6,6 @@ data/*.pem
>  data/*.key
>  data/*.crt
>  data/*.csr
> +.tox/
> +.idea
> +repo-info

They should not be pushed. Please remove them and include in the .gitignore.

> \ No newline at end of file
> diff --git a/Makefile b/Makefile
> index 9d48829..22955cf 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,10 +1,22 @@
>  #!/usr/bin/make
>  PYTHON := /usr/bin/python3
>  export PYTHONPATH := hooks
> +PROJECTPATH = $(dir $(realpath $(MAKEFILE_LIST)))
> +CHARM_NAME = $(notdir $(PROJECTPATH:%/=%))
> +ifndef CHARM_BUILD_DIR
> +    CHARM_BUILD_DIR := /tmp/$(CHARM_NAME)-builds
> +    $(warning Warning CHARM_BUILD_DIR was not set, defaulting to $(CHARM_BUILD_DIR))
> +endif

Given this is out of scope, probably would be better to have that changes in a different MR. Plus we are still waiting for final approval on the build step from Jeremy

>  
>  default:
>  	echo Nothing to do
>  
> +build:
> +	@echo "Building charm to base directory $(CHARM_BUILD_DIR)/$(CHARM_NAME)"
> +	@-git describe --tags > ./repo-info
> +	@mkdir -p $(CHARM_BUILD_DIR)/$(CHARM_NAME)
> +	@cp -r * $(CHARM_BUILD_DIR)/$(CHARM_NAME)
> +
>  # Primitive test runner. Someone please fix this.
>  test:
>  	tests/00-setup


-- 
https://code.launchpad.net/~addyess/charm-nagios/+git/charm-nagios/+merge/387090
Your team Nagios Charm developers is subscribed to branch charm-nagios:master.