fix: replace files dropped in merge forward

[aramprice]

Fixes:

  1) AWS Stemcell installed by bosh_aws_agent_settings /var/vcap/bosh/agent.json sets InstanceStorageDevicePattern for NVMe instance storage
     Failure/Error: expect(config.dig("Platform", "Linux", "InstanceStorageDevicePattern")).to eq("/dev/nvme*n1")
     
       expected: "/dev/nvme*n1"
            got: nil
     
       (compared using ==)
     # ./spec/stemcells/aws_spec.rb:33:in `block (4 levels) in <top (required)>'

  2) AWS Stemcell installed by bosh_aws_agent_settings /var/vcap/bosh/agent.json sets InstanceStorageManagedVolumePattern to exclude EBS volumes
     Failure/Error: expect(config.dig("Platform", "Linux", "InstanceStorageManagedVolumePattern")).to eq("/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_*")
     
       expected: "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_*"
            got: nil
     
       (compared using ==)
     # ./spec/stemcells/aws_spec.rb:38:in `block (4 levels) in <top (required)>'

^ https://bosh.ci.cloudfoundry.org/teams/stemcell/pipelines/ubuntu-noble-builder/jobs/build-aws-xen-hvm/builds/631#L6a2a20e2:15435:15451

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9f1a23ae-c39b-4b0d-8c98-a3261f521e8b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch fix-bad-merge

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[aramprice]

@Ivaylogi98 or @neddp would one of you mind weighing in on whether this is the right fix for the errors in CI from my recent merge forward Jammy => Noble? Thanks!

[Copilot]

Pull request overview

This PR aims to restore AWS stemcell agent configuration that was lost during a merge-forward, fixing failing AWS stemcell RSpec expectations around NVMe instance storage patterns by ensuring /var/vcap/bosh/agent.json includes the required keys.

Changes:

• Replace the previously shipped agent.json asset with an apply.sh heredoc that writes /var/vcap/bosh/agent.json during the bosh_aws_agent_settings stage.
• Add AWS NVMe instance storage patterns (InstanceStorageDevicePattern, InstanceStorageManagedVolumePattern) to the generated agent config.
• Introduce stemcell_builder/lib/prelude_agent.bash to provide a helper used when generating the JSON.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File	Description
stemcell_builder/stages/bosh_aws_agent_settings/assets/agent.json	Removed static AWS agent config asset (now generated during apply).
stemcell_builder/stages/bosh_aws_agent_settings/apply.sh	Now generates /var/vcap/bosh/agent.json via heredoc and adds NVMe patterns.
stemcell_builder/lib/prelude_agent.bash	New helper providing a JSON snippet for the partitioner type.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[neddp]

Hi @aramprice,

Thanks for looking into this. I noticed that the same applies for all providers and cp with the agent.json is being used on noble, while the heredoc is used across jammy. I don't understand how git handled this, but it looks like the agent.json remains outdated this way.
The assets directory is completely removed on jammy, for the heredoc approach.

I think we should do the same for the other provider's agent.sh files on noble to keep it consistent in the future.

[aramprice]

@neddp - I switched (back) to the cp style we have in noble.

Would you mind taking a look to validate that the AWS agent.json is correct?

Feel free to merge if it looks good. I'm OOO until 2026-06-16

Thanks!

[mkocher]

This is breaking the Resolute build too, and the fix looks good to me. I'll go ahead and merge this.

[neddp]

Opened a PR that matches the noble structure on jammy - #646