Merge ~cmatsuoka/usd-importer:fix-snapcraft-yaml into usd-importer:master

Proposed by Claudio Matsuoka on 2019-02-28
Status: Merged
Merged at revision: 60fc847ba2ba16bd57c41f2b49ceacf7e8b2d298
Proposed branch: ~cmatsuoka/usd-importer:fix-snapcraft-yaml
Merge into: usd-importer:master
Diff against target: 23 lines (+5/-0)
1 file modified
snap/snapcraft.yaml (+5/-0)
Reviewer Review Type Date Requested Status
Robie Basak Approve on 2019-02-28
Server Team CI bot continuous-integration 2019-02-28 Approve on 2019-02-28
Review via email:

Commit message

keep jenkins happy

Description of the change

Snap package builds failed due to missing build packages and library conflicts. The exact cause is unknown, but likely related to updates of other packages in xenial. This patch fixes the snap package creation, please test thoroughly to avoid any unexpected side effects.

To post a comment you must log in.

PASSED: Continuous integration, rev:60fc847ba2ba16bd57c41f2b49ceacf7e8b2d298
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:

review: Approve (continuous-integration)
Robie Basak (racb) wrote :

Looks good. Thank you for sorting this!

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 eacf05b..7d8a997 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -176,6 +176,8 @@ parts:
6 source:
7 source-type: tar
8 source-checksum: sha384/fd87f3f02e86179e8bc8e07f52ca8aad59db93c7dd53057198b77fe4591593cda4a29d935b6e8a8386f6f6ddb83d4762
9+ build-packages:
10+ - libffi-dev
11 stage:
12 - -usr/bin/py*
13 - -usr/bin/2to3*
14@@ -388,6 +390,9 @@ parts:
15 - -usr/bin/mpicalc
16 - -usr/include/gcrypt.h
17 - -usr/share/aclocal/libgcrypt.m4
18+ - -lib/python3.6/site-packages/cryptography/hazmat/bindings/
19+ - -lib/python3.6/site-packages/cryptography/hazmat/bindings/
20+ - -lib/python3.6/site-packages/cryptography/hazmat/bindings/
21 prime:
22 - -usr/share/doc
23 install: |


People subscribed via source and target branches