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

fix: change pebble dir in 24.04 from /.rock/bin to /usr/bin #552

Conversation

linostar
Copy link
Contributor

@linostar linostar commented Apr 16, 2024

  • Have you signed the CLA?

Description

After discussion with the Starcraft team, it has been agreed on to move the pebble binary to /usr/bin instead of /.rock/bin for 24.04, since we're quite sure that the /usr/bin dir won't change for 24.04.

This PR builds over the previous PR #528 but replaces the pebble path for 24.04 and onwards to /usr/bin, and change .

Related PRs

PR #528

Testing

Aside from spread tests, this is a manual test using the Hello World rock with build-base of 24.04 to confirm the path of pebble binary.

Rock:

name: chiselled-hello
summary: Hello world from Chisel slices
description: A "bare" rock containing the "hello" package binaries from Chisel slices.
license: Apache-2.0

version: "latest"
base: bare
build_base: [email protected]
platforms:
  amd64:

services:
  hello_service:
    startup: disabled
    command: hello
    override: replace

parts:
  hello:
    plugin: nil
    stage-packages:
      - hello_bins

Results

image

@linostar linostar changed the base branch from main to hotfix/1.3 April 16, 2024 19:25
@linostar linostar marked this pull request as ready for review April 16, 2024 19:51
@linostar
Copy link
Contributor Author

@cjdcordeiro @tigarmo Ready for review.

@tigarmo tigarmo requested review from cjdcordeiro and tigarmo and removed request for cjdcordeiro April 16, 2024 20:19
Copy link
Collaborator

@tigarmo tigarmo left a comment

Choose a reason for hiding this comment

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

thanks!

tests/spread/rockcraft/base-devel/task.yaml Show resolved Hide resolved
@linostar linostar requested a review from tigarmo April 17, 2024 02:54
Copy link
Collaborator

@cjdcordeiro cjdcordeiro left a comment

Choose a reason for hiding this comment

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

Seems pretty clean to me! Thanks

Copy link
Collaborator

@tigarmo tigarmo left a comment

Choose a reason for hiding this comment

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

thanks!

@tigarmo tigarmo merged commit 15b653a into canonical:hotfix/1.3 Apr 17, 2024
12 checks passed
@linostar linostar deleted the ROCKS-1088/add-pebble-binary-path-to-rock-path branch April 17, 2024 11:40
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