launchpad-reviewers team mailing list archive

[Colin Watson <mp+439229@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-codeimport:charmcraft into lp-codeimport:master.

Commit message:
charm: Build using charmcraft

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/439229

I've left the old build system in place as well for a transitional period, but this is much simpler and will let us use Launchpad charm recipes.  `charmcraft` doesn't support xenial, so this relies on having build artifacts that can be used with bionic (see https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/439226).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-codeimport:charmcraft into lp-codeimport:master.

diff --git a/charm/.gitignore b/charm/.gitignore
index 04ae82c..da831d3 100644
--- a/charm/.gitignore
+++ b/charm/.gitignore
@@ -1,3 +1,4 @@
+*.charm
 bundle.yaml
 dist
 tmp
diff --git a/charm/lp-codeimport/charmcraft.yaml b/charm/lp-codeimport/charmcraft.yaml
new file mode 100644
index 0000000..4dfca85
--- /dev/null
+++ b/charm/lp-codeimport/charmcraft.yaml
@@ -0,0 +1,45 @@
+type: charm
+bases:
+  - build-on:
+    - name: ubuntu
+      channel: "18.04"
+      architectures: [amd64]
+    run-on:
+    - name: ubuntu
+      channel: "18.04"
+      architectures: [amd64]
+parts:
+  charm-wheels:
+    source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
+    source-commit: "fe523e25521254c2034eea96e2fde079034b593a"
+    source-submodules: []
+    source-type: git
+    plugin: dump
+    organize:
+      "*": charm-wheels/
+    prime:
+      - "-charm-wheels"
+  ols-layers:
+    source: https://git.launchpad.net/ols-charm-deps
+    source-commit: "df20c87d00ca0bfda64c1b58d8254220aa55f680"
+    source-submodules: []
+    source-type: git
+    plugin: dump
+    organize:
+      "*": layers/
+    stage:
+      - layers
+    prime:
+      - "-layers"
+  launchpad:
+    after:
+      - charm-wheels
+      - ols-layers
+    source: .
+    plugin: reactive
+    build-snaps: [charm/2.x/stable]
+    build-environment:
+      - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
+      - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
+      - PIP_NO_INDEX: "true"
+      - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
diff --git a/charm/lp-codeimport/metadata.yaml b/charm/lp-codeimport/metadata.yaml
index f509db3..b253908 100644
--- a/charm/lp-codeimport/metadata.yaml
+++ b/charm/lp-codeimport/metadata.yaml
@@ -8,6 +8,7 @@ tags:
   - network
 series:
   - xenial
+  - bionic
 subordinate: false
 resources:
   lp-codeimport: