pluginhandler: allow cleaning the build step (#3126)

PluginV2 based parts were not able to clean due to the improper guard
set at the start of the clean_build method.

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

Author: Sergio Schvezov

snapcraft/internal/pluginhandler/__init__.py

@@ -777,10 +777,6 @@ def _get_machine_manifest(self):
         }
 
     def clean_build(self):
-        # Only relevant for PluginV1.
-        if not isinstance(self.plugin, plugins.v1.PluginV1):
-            return
-
         if self.is_clean(steps.BUILD):
             return
 

tests/spread/plugins/v1/rust/rebuild/task.yaml

@@ -43,7 +43,7 @@ execute: |
   snapcraft build
 
   # Verify the changed source is reflected
-  if ! diff src/main.rs parts/rust-hello/src/src/main.rs; then
+  if ! diff src/main.rs parts/hello/src/src/main.rs; then
     echo "The source has not changed."
     exit 1
   fi

tests/spread/plugins/v1/rust/rust-toolchain/task.yaml

@@ -35,4 +35,4 @@ execute: |
 
   # Verify that nightly was used instead of the default stable
   # e.g.; MATCH 'rustc-version: rustc 1.39.0-beta.1 (968967007 2019-09-24)'
-  MATCH 'rustc-version: rustc .*-beta.*' < parts/rust-hello/state/build
+  MATCH 'rustc-version: rustc .*-beta.*' < parts/hello/state/build

tests/spread/plugins/v2/build-and-run-hello/task.yaml

@@ -1,4 +1,6 @@
-summary: Build, rebuild and run hello.c with different plugin configurations
+summary: >-
+  Build, clean, build, modify and rebuild, and run hello
+  with different plugin configurations
 
 environment:
   SNAP/autotools: autotools-hello
@@ -47,6 +49,12 @@ execute: |
   snap install "${SNAP}"_1.0_*.snap --dangerous
   [ "$($SNAP)" = "hello world" ]
 
+  # Clean the hello part, then build and run again.
+  snapcraft clean hello
+  snapcraft
+  snap install "${SNAP}"_1.0_*.snap --dangerous
+  [ "$($SNAP)" = "hello world" ]
+
   # Make sure that what we built runs with the changes applied.
   if [ -f hello ]; then
     modified_file=hello

tests/spread/plugins/v2/snaps/autotools-hello/snap/snapcraft.yaml

@@ -15,7 +15,7 @@ apps:
     command: usr/bin/hello
 
 parts:
-  autotools-project:
+  hello:
     plugin: autotools
     source: .
     autotools-configure-parameters:

tests/spread/plugins/v2/snaps/cmake-hello/snap/snapcraft.yaml

@@ -15,7 +15,7 @@ apps:
     command: usr/bin/cmake-hello
 
 parts:
-  cmake-project:
+  hello:
     plugin: cmake
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr

tests/spread/plugins/v2/snaps/dump-hello/snap/snapcraft.yaml

@@ -12,6 +12,6 @@ apps:
     command: hello
 
 parts:
-  nil-part:
+  hello:
     plugin: dump
     source: .

tests/spread/plugins/v2/snaps/go-build-tags/snap/snapcraft.yaml

@@ -14,7 +14,7 @@ apps:
     command: bin/go-build-tags
 
 parts:
-  go-build-tags:
+  hello:
     source: .
     plugin: go
     go-buildtags:

tests/spread/plugins/v2/snaps/go-mod-hello/snap/snapcraft.yaml

@@ -14,6 +14,6 @@ apps:
     command: bin/go-mod-hello
 
 parts:
-  go-hello:
+  hello:
     source: .
     plugin: go

tests/spread/plugins/v2/snaps/make-hello/snap/snapcraft.yaml

@@ -15,7 +15,7 @@ apps:
     command: bin/hello
 
 parts:
-  make-project:
+  hello:
     plugin: make
     make-parameters:
       - HELLO=1