MAAS

Merge ~adam-collard/maas:snapcraft-setuptools into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. snapcraft-setuptools
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 021b56446523308df42c870e0a6543262717815f
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:snapcraft-setuptools
Merge into: maas:master
Diff against target: 15 lines (+4/-0)
1 file modified
snap/snapcraft.yaml (+4/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alberto Donato (community) Approve
Review via email: mp+374157@code.launchpad.net

Commit message

[snap] Add python-packages to maas part to work around lp:1613898

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

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

LANDING
-b snapcraft-setuptools lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

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

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

UNIT TESTS
-b snapcraft-setuptools lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 021b56446523308df42c870e0a6543262717815f

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 4045ed6..c31547b 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -141,6 +141,10 @@ parts:
6 - tcpdump
7 - ubuntu-keyring
8 - util-linux
9+ # As a workaround to issues similar to https://pad.lv/1613898 we manually specify setuptools and wheel
10+ python-packages:
11+ - setuptools
12+ - wheel
13 organize:
14 lib/python3.*/site-packages/etc/*: etc
15 lib/python3.*/site-packages/usr/bin/*: usr/bin

Subscribers

People subscribed via source and target branches