Merge ~racb/git-ubuntu:nacc-breakdown/lxc-snap-env into git-ubuntu:master

[Robie Basak]

Make Jenkins happy.

[Robie Basak (racb)]

Why are we unsetting SNAP for some calls to lxc, but not all of them? Is there some criteria we have to use to decide this? Or are you just working around the calls that happen to break for now?

As long as we have to work around some other project's bug, I'd like to have a bug reference in a comment in our code which shows us why the workaround is present and what its status is for us to get rid of it. So when I asked for a bug against this, I meant I wanted an open bug task against the project which we are working around (whether that is snapd or lxd I'm not sure).

review: Needs Information

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

FAILED: Continuous integration, rev:c21e653eddde8b9ad7d4d89ee56ede9a4d504dc1
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~racb/usd-importer/+git/usd-importer/+merge/336297/+edit-commit-message

https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/246/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    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/246/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:d16589b9f2835f9cf1cae6daf228447b343e7330
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~racb/usd-importer/+git/usd-importer/+merge/336297/+edit-commit-message

https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/250/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    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/250/rebuild

review: Needs Fixing (continuous-integration)

Unmerged commits

d16589b... by Nish Aravamudan on 2018-01-09

build: unset SNAP in lxc's env

Ever since lxc gained snap support, it assumed that if SNAP is set in
it's environment that lxc itself was running as a SNAP. This is not
necessarily the case when git-ubuntu itself is a classic snap (and thus
has SNAP set in its environment) but is calling lxc in the host. Unset
SNAP manually on lxc run() calls.

LP: #1741949

diff --git a/gitubuntu/build.py b/gitubuntu/build.py
index 072d3e7..148d12d 100644
--- a/gitubuntu/build.py
+++ b/gitubuntu/build.py
@@ -1029,14 +1029,26 @@ def do_build_lxd_exitstack(
             "Failed to run apt in ephemeral build container"
         )
 
+    # lxd assumes that if SNAP is set in the environment, that it is
+    # running as a snap. That is not necessarily true when git-ubuntu is
+    # the snapped application. So unset SNAP before we exec.
+    # LP: #1741949
+    env_unset_SNAP = os.environ.copy()
     try:
-        run([
-            lxc,
-            'file',
-            'push',
-            archive_tarball_name,
-            '%s/tmp/' % container_name,
-        ])
+        del env_unset_SNAP['SNAP']
+    except KeyError:
+        pass
+    try:
+        run(
+            [
+                lxc,
+                'file',
+                'push',
+                archive_tarball_name,
+                '%s/tmp/' % container_name,
+            ],
+            env=env_unset_SNAP,
+        )
     except Exception as e:
         raise RuntimeError(
             "Failed to push archive tarball to ephemeral build container"
@@ -1046,7 +1058,7 @@ def do_build_lxd_exitstack(
     cmd.extend(tarballs)
     cmd.extend(['%s/tmp/' % container_name,])
     try:
-        run(cmd)
+        run(cmd, env=env_unset_SNAP)
     except Exception as e:
         raise RuntimeError("Failed to push orig tarballs to container") from e
 
@@ -1149,7 +1161,7 @@ def do_build_lxd_exitstack(
         ]
     )
     cmd.extend([os.pardir,])
-    run(cmd)
+    run(cmd, env=env_unset_SNAP)
 
     return [os.path.join(os.pardir, f) for f in built_temp_contents]