Merge ~nacc/git-ubuntu:apt-repo into git-ubuntu:master

[Nish Aravamudan]

Make jenkins happy

[Nish Aravamudan (nacc)]

I haven't yet verified this is perfect for still using the system gpg and not the snapped one, but I will do that tomorrow (or you can).

[Nish Aravamudan (nacc)]

But it does pass the self-test on my machine (and i found a quirk of the self-test, if you run it from a importer Git repository, the coverage check fails).

[Nish Aravamudan (nacc)]

On Tue, Feb 27, 2018 at 7:45 PM, Nish Aravamudan
<email address hidden> wrote:
> But it does pass the self-test on my machine (and i found a quirk of the self-test, if you run it from a importer Git repository, the coverage check fails).

I think this is because of --cov=gitubuntu and if . is also a
gitubuntu package, then it can't determine which you mean.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:aa014cbc4d544ef8b872138535afb0437caf68c4
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/329/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    FAILED: Unit Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/329/rebuild

review: Needs Fixing (continuous-integration)

83b80ef... by Nish Aravamudan on 2018-02-28

apt_repo_test: gpg should call the snapped gpg-agent

This ensures self-compatibility and ideally not affecting the running
user's gpg-agent.

The order of arguments to gpg matters, hence where this option is added.

[Nish Aravamudan (nacc)]

Just pushed a fixup commit for the gpg-agent stuff. Presuming this passes, I will land it after squashing the changes odwn.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:aa014cbc4d544ef8b872138535afb0437caf68c4
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/331/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/331/rebuild

review: Approve (continuous-integration)

[Nish Aravamudan (nacc)]

Merged after cleanup as 48249b21607fdfbb80af9d53e8d0b1375d8778c1

diff --git a/gitubuntu/apt_repo_test.py b/gitubuntu/apt_repo_test.py
index 3488125..c17818f 100644
--- a/gitubuntu/apt_repo_test.py
+++ b/gitubuntu/apt_repo_test.py
@@ -7,6 +7,7 @@ import urllib.error
 
 import pkg_resources
 import pytest
+import shutil
 
 import gitubuntu.apt_repo as target
 
@@ -22,6 +23,9 @@ def trustedkeys():
                 'gpg',
                 '--no-default-keyring',
                 '--keyring', trustedkeys_path,
+                '--agent-program', shutil.which(
+                    'gpg-agent', path=os.getenv('PATH', os.defpath)
+                ),
                 '--import',
                     pkg_resources.resource_filename(
                         'gitubuntu', 'apt_repo_test/pubkey.asc'
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9bf85a3..38ec2d2 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -257,6 +257,57 @@ parts:
       stage-packages:
          - distro-info
       after: [python3]
+   libgpg-error:
+      plugin: autotools
+      source: https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
+      source-type: tar
+      configflags: [--prefix=/usr]
+      stage:
+         - -usr/share/info
+   libgcrypt:
+      plugin: autotools
+      source: https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.1.tar.bz2
+      source-type: tar
+      configflags: [--prefix=/usr]
+      stage:
+         - -usr/share/info
+   libassuan:
+      plugin: autotools
+      source: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2
+      source-type: tar
+      configflags: [--prefix=/usr]
+      after: [libgpg-error]
+      stage:
+         - -usr/share/info
+   libksba:
+      plugin: autotools
+      source: https://gnupg.org/ftp/gcrypt/libksba/libksba-1.3.5.tar.bz2
+      source-type: tar
+      configflags: [--prefix=/usr]
+      stage:
+         - -usr/share/info
+   npth:
+      plugin:  autotools
+      source: https://gnupg.org/ftp/gcrypt/npth/npth-1.5.tar.bz2
+      source-type: tar
+      configflags: [--prefix=/usr]
+      stage:
+         - -usr/share/info
+   gnupg2:
+      plugin: autotools
+      source: https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2
+      source-type: tar
+      configflags:
+         - --prefix=/usr
+         - --enable-gpg2-is-gpg
+      after:
+         - libgpg-error
+         - libgcrypt
+         - libassuan
+         - libksba
+         - npth
+      stage:
+         - -usr/share/info
    devscripts:
       plugin: nil
       stage-packages:
@@ -310,6 +361,14 @@ parts:
          - -lib/python3.6/site-packages/oauth*
          - -lib/python3.6/site-packages/launchpadlib*
          - -usr/lib/python3.6
+         - -usr/bin/gpg-error*
+         - -usr/share/aclocal/gpg-error.m4
+         - -usr/bin/dumpsexp
+         - -usr/bin/hmac256
+         - -usr/bin/libgcrypt-config
+         - -usr/bin/mpicalc
+         - -usr/include/gcrypt.h
+         - -usr/share/aclocal/libgcrypt.m4
       prime:
          - -usr/share/doc
       install: |