MAAS

Merge ~andreserl/maas:2.3_better_snap into maas:2.3

  1. Git
  2. lp:~andreserl/maas
  3. 2.3_better_snap
  4. Merge into 2.3
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: d5e6ed5b26d835460969aa208d925826a15cb236
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:2.3_better_snap
Merge into: maas:2.3
Diff against target: 44 lines (+11/-6)
1 file modified
snap/snapcraft.yaml (+11/-6)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Andres Rodriguez (community) Approve
Review via email: mp+335278@code.launchpad.net

Commit message

Partially backport cb8d5d4b8a1678f130e4fe632b33bb04c671ac52

Improve the snap so that it builds regardless of the python version and better organize files.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b 2.3_better_snap lp:~andreserl/maas into -b 2.3 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1003/consoleText

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b 2.3_better_snap lp:~andreserl/maas into -b 2.3 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: d5e6ed5b26d835460969aa208d925826a15cb236

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index ed3948a..3a5be12 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -1,6 +1,6 @@
6 name: maas
7 version: git
8-version-script: utilities/calc-snap-version
9+version-script: utilities/calc-snap-version
10 summary: Metal as a Service
11 description: |
12 Total automation of your physical servers for amazing data center operational efficiency.
13@@ -118,12 +118,17 @@ parts:
14 - python3-simplejson
15 - python3-markupsafe
16 organize:
17- lib/python3.5/site-packages/etc: etc
18- lib/python3.5/site-packages/usr: usr
19+ lib/python3.*/site-packages/etc/*: etc
20+ lib/python3.*/site-packages/usr/bin/*: usr/bin
21+ lib/python3.*/site-packages/usr/lib/*: usr/lib
22+ lib/python3.*/site-packages/usr/sbin/*: usr/sbin
23+ lib/python3.*/site-packages/usr/share/*: usr/share
24 usr/lib/curtin/helpers: usr/lib/python3/dist-packages/helpers
25 filesets:
26 remove:
27- - -lib/python3.5/site-packages/maastesting
28+ - -lib/python3.*/site-packages/etc
29+ - -lib/python3.*/site-packages/usr
30+ - -lib/python3/dist-packages/maastesting
31 - -share
32 - -usr/include/libjs-angularjs
33 - -usr/share/applications
34@@ -150,8 +155,8 @@ parts:
35 plugin: dump
36 source: twisted/plugins
37 organize:
38- maasrackd.py: lib/python3.5/site-packages/twisted/plugins/maasrackd.py
39- maasregiond.py: lib/python3.5/site-packages/twisted/plugins/maasregiond.py
40+ maasrackd.py: usr/lib/python3/dist-packages/twisted/plugins/maasrackd.py
41+ maasregiond.py: usr/lib/python3/dist-packages/twisted/plugins/maasregiond.py
42 snap:
43 plugin: dump
44 source: snap

Subscribers

People subscribed via source and target branches