release changelog and changes for bionic

debian/changelog

@@ -1,4 +1,4 @@
-snapcraft (2.40) xenial; urgency=medium
+snapcraft (2.40+18.04) bionic; urgency=medium
 
   [ Sergio Schvezov ]
   * elf: better debug messages (#1950)

tests/integration/general/test_elf.py

@@ -106,7 +106,7 @@ def _setup_project(self, keep_execstack: bool):
         snapcraft_yaml.update_part('test-part', {
             'plugin': 'nil',
             'build-attributes': attributes,
-            'build': ('/usr/sbin/execstack --set-execstack '
+            'build': ('/usr/bin/execstack --set-execstack '
                       '$SNAPCRAFT_PART_INSTALL/usr/bin/hello'),
             'prime': ['usr/bin/hello'],
             'build-packages': ['execstack'],

tests/integration/general/test_snap.py

@@ -28,11 +28,12 @@
     Not,
 )
 
-from tests import integration
+from tests import integration, skip
 
 
 class SnapTestCase(integration.TestCase):
 
+    @skip.skip_unless_codename('xenial', 'test designed for xenial')
     def test_snap(self):
         self.copy_project_to_cwd('assemble')
         self.run_snapcraft('snap')

tests/integration/plugins/test_go_plugin.py

@@ -49,7 +49,7 @@ def test_classic_with_conflicting_build_id(self):
 
         interpreter = subprocess.check_output([
             self.patchelf_command, '--print-interpreter', bin_path]).decode()
-        expected_interpreter = r'^/snap/core/current/.*'
+        expected_interpreter = r'^/snap/.*'
         self.assertThat(interpreter, MatchesRegex(expected_interpreter))
 
     def test_building_multiple_main_packages(self):

tests/integration/snaps/ant-with-options/snapcraft.yaml

@@ -14,3 +14,6 @@ parts:
       dist.dir: 'target'
     ant-build-targets:
       - artifacts
+    stage-packages: [libc6]
+    stage:
+      - -usr/share/icons

tests/integration/snaps/go-gotty/snapcraft.yaml

@@ -16,6 +16,7 @@ parts:
     plugin: go
     go-importpath: github.com/yudai/gotty
     after: [go]
+    stage-packages: [libc6]
   go:
     source-tag: go1.9.2
     source-depth: 1

tests/integration/snaps/nil-plugin-pkgfilter/snapcraft.yaml

@@ -13,6 +13,7 @@ parts:
         plugin: nil
         stage-packages:
             - network-manager
+            - libc6
         snap:
             - usr/bin/nmcli
             - usr/lib/*/libnm*

tests/integration/snaps/python-hello/snap/snapcraft.yaml

@@ -15,3 +15,4 @@ parts:
   python-part:
     source: .
     plugin: python
+    stage-packages: [libc6]

tests/integration/snaps/ruby-hello/snap/snapcraft.yaml

@@ -23,3 +23,6 @@ parts:
       - lib
     install: |
       cp ./ruby-hello.rb $SNAPCRAFT_PART_INSTALL/bin/ruby-hello.rb
+    stage-packages:
+      - libc6
+