chore: merge feature/components into feature/craft-application #4654

sergiusens · 2024-03-11T18:37:57Z

Have you followed the guidelines for contributing?
Have you signed the CLA?
Have you successfully run tox run -m lint?
Have you successfully run tox run -e test-py310? (supported versions: py39, py310, py311, py312)

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

Co-authored-by: Sheng Yu <sheng.yu@canonical.com>

Upcoming Chisel (and chisel-releases) changes will break older versions of the tool; update it to v0.8.1 which is compatible with this change and gives us some breathing room before we change the way Chisel is provisioned. Ref: canonical/rockcraft#449 Co-authored-by: Tiago Nobrega <tiago.nobrega@canonical.com>

…4566) Components beginning with `snap-` are reserved for future use by snapd. Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

mr-cal

Looks good. The CI failures are due to #4651, but once canonical/craft-parts#684 lands and you revert the changes to the requirement files here, the new top-level partition implementation will cause tests to start failing (like tests that assert for prime/default/<file>).

snapcraft/providers.py

sergiusens · 2024-03-12T19:26:17Z

Looks good. The CI failures are due to #465, but once canonical/craft-parts#684 lands and you revert the changes to the requirement files here, the new top-level partition implementation will cause tests to start failing (like tests that assert for prime/default/<file>).

Wrong issue linked?

mr-cal · 2024-03-12T19:37:41Z

Looks good. The CI failures are due to #465, but once canonical/craft-parts#684 lands and you revert the changes to the requirement files here, the new top-level partition implementation will cause tests to start failing (like tests that assert for prime/default/<file>).

Wrong issue linked?

Whoops, yes. I corrected the original comment from 465 to 4651

syu-w

Not sure if we need to wait the fixes

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

tigarmo · 2024-03-14T11:37:58Z

There are quite a few test failures

sergiusens · 2024-03-14T12:13:34Z

yeah, the version check tests are all failing, I am not sure what happened, because I am certain I fixed them 😓

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

A refactor happened in Craft Parts and the logic was not carried over to Snapcraft in the Craft Parts commit 9fe38d11637f037b37fe76aa5ecc013a9bc39695 This is however an irrelevant test with regards to the Snapcraft Application itself. Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

codecov · 2024-03-14T18:13:57Z

Codecov Report

Attention: Patch coverage is 95.20958% with 8 lines in your changes are missing coverage. Please review.

Project coverage is 89.42%. Comparing base (a019fe7) to head (7b083e6).
Report is 41 commits behind head on feature/craft-application.

Files	Patch %	Lines
snapcraft/parts/lifecycle.py	91.48%	4 Missing ⚠️
snapcraft/models/project.py	95.38%	3 Missing ⚠️
snapcraft/pack.py	96.00%	1 Missing ⚠️

Additional details and impacted files

@@                      Coverage Diff                      @@
##           feature/craft-application    #4654      +/-   ##
=============================================================
+ Coverage                      89.14%   89.42%   +0.27%     
=============================================================
  Files                            331      336       +5     
  Lines                          22078    22433     +355     
=============================================================
+ Hits                           19682    20061     +379     
+ Misses                          2396     2372      -24

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

tigarmo · 2024-03-14T20:32:41Z

@sergiusens I see the component-related spread tests are still failing, do you want me to review the PR still?

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

Also make the clean actually clean the correct provider Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

It was cd-ing into snap but not cleaning from within. Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

sergiusens · 2024-03-14T22:09:04Z

@tigarmo organize is not organizing from the looks of it. Would be great if anyone can figure out why. I added a couple more test fixes and a spread cleanup as there were errors in how it was done (left overs)

sergiusens · 2024-03-14T22:10:17Z

we also do not need 3 tests for components, one could have been enough

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

Partitions/Components are not working in non-destructive-mode Clean up testing Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

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

…CRAFT-2581/merge-components

use better naming for easier error detection Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

mr-cal · 2024-03-18T23:04:07Z

tests/spread/core22/components/snapcraft.yaml

+      # exclude a file in the default partition
+      - -(default)/other-file-in-snap
+    prime:
+      # exclude a file in a partitionk


Suggested change

# exclude a file in a partitionk

# exclude a file in a partition

mr-cal · 2024-03-18T23:05:22Z

setup.py

@@ -101,7 +101,7 @@ def recursive_data_files(directory, install_directory):
    "craft-cli",
    "craft-grammar",
    "craft-parts",
-    "craft-providers",
+    "craft-providers @ git+https://github.com/canonical/craft-providers@main#egg=craft-providers",


craft-providers 1.23.1 is released, I don't think you need to bring this in

great! I thought I had gotten rid of this!

mr-cal · 2024-03-18T23:31:51Z

tests/spread/core22/components/task.yaml

+  snap refresh snapd --stable
+
+execute: |
+  # Craft Parts is not partitions aware during organize in managed mode


I tested, canonical/craft-parts#689 fixes this, so we'll be able to fix this in a subsequent PR

might as well have @cmatsuoka release that tomorrow and I can just ensure we update the test here

Fixes an issue discovered via canonical/snapcraft#4654 where `organize_files()` would organize in the cwd instead of the project's base_dir. The problem was that `organize_files()` was redefining a part's install directories incorrectly by creating relative filepaths. To fix this, organize_files now accepts the part's install directories instead of redefining them. Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

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

They need fixing and should be added as part of the task to implement the feature itself. Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

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

mr-cal and others added 12 commits December 11, 2023 17:02

feat(project): add components model (#4492)

821b73a

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

feat(lifecycle): conditionally enable partitions for components (#4493)

79dcf97

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

feat(meta): generate metadata for components (#4503)

d20a073

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

feat: pack components (#4506)

71fa126

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

fix: install snapd from edge inside build environments (#4514)

45968ff

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

chore(deps): update black and pyright (#4567)

7e8aab7

Co-authored-by: Sheng Yu <sheng.yu@canonical.com>

feat(projects): validate component names do not begin with 'snap-' (#…

61b53dd

…4566) Components beginning with `snap-` are reserved for future use by snapd. Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

chore(merge): 'main' into 'feature/components'

910e35c

chore(merge): 'main' into 'feature/components'

46d969a

test: flatten core22 component spread tests

4ba24ac

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

test: add core24 component spread tests

f876b96

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>

sergiusens changed the title ~~Craft 2581/merge components~~ chore: merge feature/components into feature/craft-application Mar 11, 2024

chore: merge feature/components into feature/craft-application

b5db5b5

sergiusens force-pushed the CRAFT-2581/merge-components branch from 35bd29b to b5db5b5 Compare March 12, 2024 16:57

sergiusens marked this pull request as ready for review March 12, 2024 17:04

sergiusens requested review from mr-cal and syu-w March 12, 2024 17:04

mr-cal reviewed Mar 12, 2024

View reviewed changes

snapcraft/providers.py Show resolved Hide resolved

mr-cal mentioned this pull request Mar 12, 2024

Install snapd from edge only when components are enabled #4656

Closed

syu-w approved these changes Mar 12, 2024

View reviewed changes

sergiusens added 2 commits March 13, 2024 15:54

chore: merge feature/craft-application

9f5e350

chore(deps): bump craft-parts to 1.28.0

78cdf45

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

sergiusens requested a review from tigarmo March 13, 2024 18:59

fix(tests): update invalid component version expectations

b246709

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

sergiusens force-pushed the CRAFT-2581/merge-components branch from f11914c to 035a981 Compare March 14, 2024 17:00

sergiusens added 2 commits March 14, 2024 14:52

chore: merge feature/craft-application changes

2cf7751

sergiusens force-pushed the CRAFT-2581/merge-components branch from 035a981 to 2cf7751 Compare March 14, 2024 17:55

sergiusens added 3 commits March 14, 2024 19:00

fix(spread): correct core22 component environment

75fa3f2

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

chore(spread): core22 provider setup cleanup

9330ef2

Also make the clean actually clean the correct provider Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

tests(spread): reorganize core22 components file migration

06ead65

It was cd-ing into snap but not cleaning from within. Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

sergiusens added 6 commits March 15, 2024 10:58

chore: merge craft-application

96a7dab

chore: use craft-application yaml models

b3739b4

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

tests(spread): move components to --destructive-mode

d26490a

Partitions/Components are not working in non-destructive-mode Clean up testing Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

tests(spread): components support still requires snapd from edge

6a24a94

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

Merge remote-tracking branch 'origin/feature/craft-application' into …

5c56801

…CRAFT-2581/merge-components

tests(spread): 2 tests in 1

02e755a

use better naming for easier error detection Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

mr-cal mentioned this pull request Mar 18, 2024

fix(organize): use the part's install directories canonical/craft-parts#689

Merged

1 task

tigarmo approved these changes Mar 18, 2024

View reviewed changes

mr-cal approved these changes Mar 18, 2024

View reviewed changes

cmatsuoka mentioned this pull request Mar 19, 2024

fix(organize): use the part's install directories (#689) canonical/craft-parts#690

Merged

1 task

sergiusens added 5 commits March 19, 2024 13:37

fix(spread): typo in code comment

8c8b49a

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

build-deps: go back to published Craft Providers

77a01fc

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

tests(spread): remove core24 components tests

631313f

They need fixing and should be added as part of the task to implement the feature itself. Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

fix(components): use Craft Parts that allows for managed install

289be3d

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

chore: merge feature/craft-application

7b083e6

sergiusens merged commit 76e909d into feature/craft-application Mar 19, 2024
9 of 12 checks passed

sergiusens deleted the CRAFT-2581/merge-components branch March 19, 2024 18:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: merge feature/components into feature/craft-application #4654

chore: merge feature/components into feature/craft-application #4654

sergiusens commented Mar 11, 2024

mr-cal left a comment •

edited

Loading

sergiusens commented Mar 12, 2024

mr-cal commented Mar 12, 2024

syu-w left a comment

tigarmo commented Mar 14, 2024

sergiusens commented Mar 14, 2024

codecov bot commented Mar 14, 2024 •

edited

Loading

tigarmo commented Mar 14, 2024

sergiusens commented Mar 14, 2024

sergiusens commented Mar 14, 2024

mr-cal Mar 18, 2024

mr-cal Mar 18, 2024

sergiusens Mar 18, 2024

mr-cal Mar 18, 2024 •

edited

Loading

sergiusens Mar 18, 2024

	# exclude a file in a partitionk
	# exclude a file in a partition

chore: merge feature/components into feature/craft-application #4654

chore: merge feature/components into feature/craft-application #4654

Conversation

sergiusens commented Mar 11, 2024

mr-cal left a comment • edited Loading

Choose a reason for hiding this comment

sergiusens commented Mar 12, 2024

mr-cal commented Mar 12, 2024

syu-w left a comment

Choose a reason for hiding this comment

tigarmo commented Mar 14, 2024

sergiusens commented Mar 14, 2024

codecov bot commented Mar 14, 2024 • edited Loading

Codecov Report

tigarmo commented Mar 14, 2024

sergiusens commented Mar 14, 2024

sergiusens commented Mar 14, 2024

mr-cal Mar 18, 2024

Choose a reason for hiding this comment

mr-cal Mar 18, 2024

Choose a reason for hiding this comment

sergiusens Mar 18, 2024

Choose a reason for hiding this comment

mr-cal Mar 18, 2024 • edited Loading

Choose a reason for hiding this comment

sergiusens Mar 18, 2024

Choose a reason for hiding this comment

mr-cal left a comment •

edited

Loading

codecov bot commented Mar 14, 2024 •

edited

Loading

mr-cal Mar 18, 2024 •

edited

Loading