add CHARM_LOCATION

canonical · Apr 11, 2024 · f8686b3 · f8686b3
1 parent dbb7d0b
commit f8686b3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -9,6 +9,10 @@ on:
       - "**.md"
       - "**.rst"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint-unit:
     uses: canonical/bootstack-actions/.github/workflows/lint-unit.yaml@v2

diff --git a/src/CONTRIB.md b/src/CONTRIB.md
@@ -49,9 +49,6 @@ make build
 charm build
 ```
 
-You can set various environment variables (e.g. JUJU_REPOSITORY, CHARM_BUILD_DIR) to build into 
-your desired directory. By default, the project will build into /tmp/charm-builds/duplicity. 
-
 ## Running Tests
 
 The following section will review running automated tests in the project.

diff --git a/src/tests/functional/tests/bundles/base.yaml b/src/tests/functional/tests/bundles/base.yaml
@@ -10,13 +10,6 @@ applications:
   nrpe:
     charm: nrpe
 
-  duplicity:
-    charm: /tmp/charm-builds/duplicity
-    options:
-      backend: file
-      remote_backup_url: 'file:///home/ubuntu/somedir'
-      disable_encryption: True
-
 relations:
   - - ubuntu
     - duplicity

diff --git a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -1,3 +1,7 @@
 applications:
   {{ charm_name }}:
     charm: "{{ CHARM_LOCATION }}/{{ charm_name }}.charm"
+    options:
+      backend: file
+      remote_backup_url: 'file:///home/ubuntu/somedir'
+      disable_encryption: True