Merge ~sylvain-pineau/plainbox-provider-snappy/+git/plainbox-provider-snappy-parts:flat_provider into ~checkbox-dev/plainbox-provider-snappy/+git/plainbox-provider-snappy-parts:master

[Sylvain Pineau]

Update the parts after the transition to a flat provider

[Paul Larson (pwlars)]

Looks reasonable, but I guess it depends on the flat provider landing too right?
+1

review: Approve

diff --git a/snapcraft.yaml b/snapcraft.yaml
index dab6cd7..a07fc3d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -10,7 +10,6 @@ parts:
         plugin: plainbox-provider
         source-type: git
         source: git://git.launchpad.net/plainbox-provider-snappy
-        source-subdir: plainbox-provider-snappy
         prepare: |
             build_pkg () {
               PKG=$1
@@ -21,8 +20,8 @@ parts:
             }
             ARCH=`dpkg --print-architecture`
             if [ "arm64" = "$ARCH" ]; then
-              sed -i 's/clocktest threaded_memtest kernel-security/clocktest threaded_memtest/' plainbox-provider-snappy/src/Makefile
-              sed -i 's/self._install_kernel_security_specials(ns)/#self._install_kernel_security_specials(ns)/' plainbox-provider-snappy/manage.py
+              sed -i 's/clocktest threaded_memtest kernel-security/clocktest threaded_memtest/' src/Makefile
+              sed -i 's/self._install_kernel_security_specials(ns)/#self._install_kernel_security_specials(ns)/' manage.py
               build_pkg gcc
             else
               build_pkg gcc-multilib
@@ -43,8 +42,3 @@ parts:
             - linux-headers-generic
             - libcap-dev
             - libasound2-dev
-    plainbox-provider-stress-tests:
-        plugin: plainbox-provider
-        source-type: git
-        source: git://git.launchpad.net/plainbox-provider-snappy
-        source-subdir: plainbox-provider-stress-tests