From 19852b65a10203649c3426fb84059af8ddb2d31e Mon Sep 17 00:00:00 2001 From: Matthew Kocher Date: Thu, 20 Aug 2026 10:59:06 -0700 Subject: [PATCH] fix acceptance tests on noble - acceptance tests need to use systemctl to stop the agent - also clean up some outdated docs --- acceptance/instance_ssh.go | 2 ++ acceptance/lifecycle_test.go | 3 ++- ci/README.md | 3 --- ci/docker/README.md | 14 -------------- docs/test.md | 2 +- 5 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 ci/README.md delete mode 100644 ci/docker/README.md diff --git a/acceptance/instance_ssh.go b/acceptance/instance_ssh.go index 0a9eca3859..64f5743ecc 100644 --- a/acceptance/instance_ssh.go +++ b/acceptance/instance_ssh.go @@ -55,6 +55,8 @@ Host docker-vm Hostname %s User %s StrictHostKeyChecking no + UserKnownHostsFile /dev/null + GlobalKnownHostsFile /dev/null IdentityFile %s ` sshConfig := fmt.Sprintf( diff --git a/acceptance/lifecycle_test.go b/acceptance/lifecycle_test.go index d7f6f7a5fa..b1115eb8ef 100644 --- a/acceptance/lifecycle_test.go +++ b/acceptance/lifecycle_test.go @@ -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)) } diff --git a/ci/README.md b/ci/README.md deleted file mode 100644 index 60ee3c54e0..0000000000 --- a/ci/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Steps for Configuring the Pipeline - -Follow the steps in [BOSH: Configuring Concourse Pipelines](https://github.com/cloudfoundry/bosh/blob/develop/docs/configuring_concourse_pipelines.md), using "bosh-init" as the value for `PROJECT_NAME`. diff --git a/ci/docker/README.md b/ci/docker/README.md deleted file mode 100644 index 478b3089f3..0000000000 --- a/ci/docker/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Building new docker image - -``` -vagrant up -vagrant ssh -``` - -On vagrant VM: - -``` -cd /opt/bosh -docker login ... -sudo ./build_docker_image.sh -``` \ No newline at end of file diff --git a/docs/test.md b/docs/test.md index 5384bc3a17..ed9448e6bc 100644 --- a/docs/test.md +++ b/docs/test.md @@ -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 \