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

Merge 7.3 hotfixes #4066

Merged
merged 4 commits into from
Mar 10, 2023
Merged

Merge 7.3 hotfixes #4066

merged 4 commits into from
Mar 10, 2023

Conversation

sergiusens
Copy link
Collaborator

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run make lint?
  • Have you successfully run pytest tests/unit?

sergiusens and others added 4 commits March 6, 2023 14:02
#4054)

Core22 ROS 2 colcon snaps couldn't build packages creating custom ROS 2 interfaces. It
was sourcing the environment before downloading the dependencies. Some dependencies
(rosidl) have specificities when sourced, hence sourcing before downloading them causes
issues.

In the case of ROS 2 message, the PYTHONPATH only had the site-packages subdir and
not the dist-packages subdir added by rosidl.

This issue couldn't appear with lxd spread tests because the lxd environment was not
cleaned properly by colcon spread tests (Debian packages were still installed, hence
the dependencies were mostly already installed).

Additionally, the advanced colcon spread tests had no entry in the spread.yaml and
were never called.

Hence, this code:

- Adds missing spread entry for colcon specific tests
- Adds package-utils.sh to restore the state of Debian package installed before a
  spread tests
- Adds a colcon spread test with a message package to highlight that there is a bug
- Fixes the bug by sourcing the ROS 2 environment after installing the ROS 2
  dependencies

Co-authored-by: Guillaume Beuzeboc <guillaume.beuzeboc@canonical.com>
Co-authored-by: Alex Lowe <alex.lowe@canonical.com>
- moved back to the full blown command-chain for KDE Neon
- removed dependency on bindtextdomain
- updated the pattern match for kde sdk snaps
- tests updated to conside core22
- fixed the added part names

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
@sergiusens sergiusens changed the title Hotfix/7.3 merge Merge 7.3 hotfixes Mar 10, 2023
@sergiusens sergiusens enabled auto-merge March 10, 2023 19:19
@codecov-commenter
Copy link

codecov-commenter commented Mar 10, 2023

Codecov Report

Merging #4066 (61b98a1) into main (abe37bc) will increase coverage by 0.00%.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@           Coverage Diff           @@
##             main    #4066   +/-   ##
=======================================
  Coverage   94.59%   94.59%           
=======================================
  Files         641      641           
  Lines       51772    51769    -3     
=======================================
  Hits        48972    48972           
+ Misses       2800     2797    -3     
Impacted Files Coverage Δ
snapcraft/extensions/kde_neon.py 100.00% <100.00%> (+4.28%) ⬆️
tests/unit/extensions/test_kde_neon.py 100.00% <100.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@sergiusens sergiusens merged commit 8b3ed19 into main Mar 10, 2023
@sergiusens sergiusens deleted the hotfix/7.3-merge branch March 10, 2023 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants