charm-k8s-telegraf

Merge ~ballot/charm-k8s-telegraf/+git/charm-k8s-telegraf:func_tests into ~sajoupa/charm-k8s-telegraf:func_tests

  1. Git
  2. lp:~ballot/charm-k8s-telegraf/+git/charm-k8s-telegraf
  3. func_tests
  4. Merge into func_tests
Proposed by Benjamin Allot
Status: Merged
Merged at revision: 2b260f589a58f8d1346fcb639af5dc7f972868f2
Proposed branch: ~ballot/charm-k8s-telegraf/+git/charm-k8s-telegraf:func_tests
Merge into: ~sajoupa/charm-k8s-telegraf:func_tests
Diff against target: 33 lines (+4/-4)
2 files modified
Makefile (+3/-3)
tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 (+1/-1)
Reviewer Review Type Date Requested Status
Laurent Sesquès Pending
Review via email: mp+393630@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index f3816ce..8cf5c6c 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -1,6 +1,6 @@
6 VERSION_TO_BUILD ?= latest
7
8-PROJECTPATH=$(dir $(realpath $(MAKEFILE_LIST)))
9+PROJECTPATH=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
10 CHARM_BUILD_DIR ?= ${PROJECTPATH}
11 METADATA_FILE="metadata.yaml"
12 CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | awk '/^name:/ {print $$2".charm"}')
13@@ -20,9 +20,9 @@ unittests:
14 @tox -e unit
15
16 build:
17- @echo "Building charm to ${CHARM_BUILD_DIR}${CHARM_NAME}"
18+ @echo "Building charm to ${CHARM_BUILD_DIR}/${CHARM_NAME}"
19 @-git rev-parse HEAD > ./repo-info
20- @TERM=linux charmcraft build -f .
21+ @cd ${CHARM_BUILD_DIR} && TERM=linux charmcraft build -f ${PROJECTPATH}
22
23 test: lint unittests functional
24 @echo "Tests completed for charm ${CHARM_NAME}."
25diff --git a/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
26index 3513a62..d19c84a 100644
27--- a/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
28+++ b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
29@@ -1,3 +1,3 @@
30 applications:
31 {{ charm_name }}:
32- charm: "{{ CHARM_BUILD_DIR }}{{ charm_name }}.charm"
33+ charm: "{{ CHARM_BUILD_DIR }}/{{ charm_name }}.charm"

Subscribers

People subscribed via source and target branches