Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions acceptance/instance_ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Host docker-vm
Hostname %s
User %s
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
GlobalKnownHostsFile /dev/null
IdentityFile %s
`
sshConfig := fmt.Sprintf(
Expand Down
3 changes: 2 additions & 1 deletion acceptance/lifecycle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ var _ = Describe("bosh", func() {
}

var shutdownAgent = func() {
_, _, exitCode, err := instanceSSH.RunCommandWithSudo("sv stop agent")
// noble stemcells supervise the agent with systemd; earlier ones used runit ('sv stop agent')
_, _, exitCode, err := instanceSSH.RunCommandWithSudo("systemctl stop agent")
Expect(err).ToNot(HaveOccurred())
Expect(exitCode).To(Equal(0))
}
Expand Down
3 changes: 0 additions & 3 deletions ci/README.md

This file was deleted.

14 changes: 0 additions & 14 deletions ci/docker/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/test.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build on the pipeline's `test-acceptance` job to pick up its image, CPI release
and stemcell, and override only the source under test:

```bash
./fly -t bosh execute -p \
fly -t bosh execute -p \
-c ci/tasks/test-acceptance.yml \
--inputs-from bosh-cli/test-acceptance \
--image docker-cpi-image \
Expand Down