Repository navigation
Fix duplicate UAA and CredHub ops in Docker CI tests - #537
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the
|
There was a problem hiding this comment.
🟢 Approval recommended
No active review issues are reported for the change removing duplicate UAA and CredHub startup arguments.
No open issues 🎉
What changed in this PR
Removes duplicate UAA and CredHub ops arguments from the shared Docker CI test task, relying on start-bosh to apply them and avoiding manifest interpolation failures.
Changes:
- Removes explicit
uaa.ymlandcredhub.ymlarguments. - Preserves optional director ops files used by Resolute and documents why the default ops are omitted.
| File | Description |
|---|---|
ci/tasks/test-docker.sh |
Removes duplicate startup ops arguments while retaining optional director configuration. |
Review effort: Balanced
The updated docker-cpi image always applies
uaa.ymlandcredhub.ymlinstart-bosh. The shared Docker test task also passes both files, so manifest generation fails when UAA tries to remove the already-removed local user configuration, as seen in test-noble-docker build 342.Remove the duplicate arguments and retain the optional director ops files used by the Resolute job. This follows the startup change in cloudfoundry/bosh@0b569530.
Validation: reproduced the original interpolation error using the startup function read from the failed build's image. With the fix, Noble and Resolute manifest interpolation succeeds, each includes exactly one UAA and CredHub release/job, and both retain the expected stemcell.
bash -n, ShellCheck, andgit diff --checkpassed.Live validation: one-off build 396909981 passed the complete Noble Docker task using the same image digest and Noble 1.647 stemcell as failed build 342. Director creation, UAA authentication, NATS deployment, the TLS smoke-test errand (exit 0), recreation, and cleanup all succeeded. Hijacking the running task confirmed the patched call and exactly one UAA and CredHub release/job in the generated manifest.