Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: spread cleanup #4634

Merged
merged 12 commits into from
Mar 6, 2024
Merged

chore: spread cleanup #4634

merged 12 commits into from
Mar 6, 2024

Conversation

sergiusens
Copy link
Collaborator

  • 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)

Copy link

codecov bot commented Mar 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.16%. Comparing base (a019fe7) to head (ca4912f).
Report is 3 commits behind head on feature/craft-application.

Additional details and impacted files
@@                      Coverage Diff                      @@
##           feature/craft-application    #4634      +/-   ##
=============================================================
+ Coverage                      89.14%   89.16%   +0.01%     
=============================================================
  Files                            331      333       +2     
  Lines                          22078    22166      +88     
=============================================================
+ Hits                           19682    19764      +82     
- Misses                          2396     2402       +6     

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

spread.yaml Outdated

tests/spread/core24/environment/:

tests/spread/core24-suites/environment/:
summary: core24 environment tests
systems:
- ubuntu-22.04*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bunch of these tests run in destructive mode, are they supposed to run on jammy still?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch! I thought I did that update

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, with the current setup:

2024-03-05T14:38:09.8946667Z     - google:ubuntu-22.04-64:tests/spread/core24-suites/environment/test-variables:test_variables
2024-03-05T14:38:09.8949593Z     - google:ubuntu-22.04-64:tests/spread/core24-suites/manifest/manifest-creation:envvars
2024-03-05T14:38:09.8953244Z     - google:ubuntu-22.04-64:tests/spread/core24-suites/patchelf/classic-patchelf
2024-03-05T14:38:09.8970397Z     - google:ubuntu-22.04-64:tests/spread/core24-suites/patchelf/strict-patchelf

With Ubuntu 24.04 -> 39541c6

    - google:ubuntu-24.04-64:tests/spread/core24-suites/environment/paths:staged_common_library
    - google:ubuntu-24.04-64:tests/spread/core24-suites/environment/test-variables:test_variables
    - google:ubuntu-24.04-64:tests/spread/core24-suites/manifest/manifest-creation:envvars
    - google:ubuntu-24.04-64:tests/spread/core24-suites/patchelf/classic-patchelf
    - google:ubuntu-24.04-64:tests/spread/core24-suites/patchelf/strict-patchelf
    - google:ubuntu-24.04-64:tests/spread/core24-suites/scriptlets/scriptlet-failures

The last one is probably my old version of spread, the patchelf ones I think I can fix up to the point where they properly fail again due to our lack of classic confinement support -> e8f688e

Copy link
Contributor

@lengau lengau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this - just a few questions.

spread.yaml Show resolved Hide resolved
Comment on lines 8 to 9
rm -f ./*.snap ./*.assert ./linter_output.txt
rm -f ./*.snap
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rm -f ./*.snap ./*.assert ./linter_output.txt
rm -f ./*.snap
rm -f ./*.snap ./*.assert ./linter_output.txt

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will do this when I rebase the PR you took over

tests/spread/core24/linters-pack/task.yaml Show resolved Hide resolved
tests/spread/core24/try/task.yaml Outdated Show resolved Hide resolved
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
- Rename the test that uses gnome to explicitly call it out
- Rename generated snap names for easy reuse
- Remove the lint file with assertions test as it is base independent

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
This will be supported in another form in the future (exposing all work
directories from the provider in the project)

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Centrally set `SNAPCRAFT_BUILD_ENVIRONMENT: ""` at the suite level
instead of in each individual task, this setting should eventually be
the default.

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Suite hierarchy the way it was has little benefit, and causes confusion
when navigating. It also implies more duplication in spread.yaml.

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
It is a task, not a suite

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Tests are running out of space now.

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
craftctl is the only future.

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Use a 24.04 system for the core24-suite
- Use --destructive-mode in the CLI
- Remove dangling set-base logic
- Remove unbound references to base

These tests still fail, but now they fail due to the lack of the classic
feature.

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
@sergiusens sergiusens merged commit e39b10d into feature/craft-application Mar 6, 2024
8 of 11 checks passed
@sergiusens sergiusens deleted the spread-factore branch March 6, 2024 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants