Merge branch 'ubuntu-noble' into jammy-to-noble

Author: aramprice

.envrc

@@ -1,3 +1,3 @@
 export GOPATH=$PWD
 export BOSH_BINARY_PATH=$(command -v bosh)
-export BOSH_os_name=ubuntu-jammy
+export BOSH_os_name=ubuntu-noble

.github/workflows/sbom.yml

@@ -19,7 +19,7 @@ jobs:
       uses: aquasecurity/trivy-action@master
       with:
         scan-type: image
-        image-ref: ghcr.io/cloudfoundry/ubuntu-jammy-stemcell
+        image-ref: ghcr.io/cloudfoundry/ubuntu-noble-stemcell
         format: spdx-json
         output: sbom.spdx.json
 

README.md

@@ -6,7 +6,7 @@ disk image that is used as a template by a BOSH Director to create VMs.
 ## Quick Start: Building a Stemcell Locally
 
 ```bash
-export short_name="jammy"
+export short_name="noble"
 
 git clone git@github.com:cloudfoundry/bosh-linux-stemcell-builder.git
 cd bosh-linux-stemcell-builder
@@ -27,9 +27,9 @@ docker run \
    bosh/os-image-stemcell-builder:${short_name}
 
 # You're now in the Docker container
-pushd bosh-stemcell
-  bundle install
-popd
+ulimit -n 16384 # only necessary if your host is Fedora
+gem install bundler
+bundle install
 
  # build OS image
 bundle exec rake stemcell:build_os_image[ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz]
@@ -56,7 +56,7 @@ installed in the operating system or when making changes to the configuration
 of those packages.
 
 ```bash
-export short_name="jammy"
+export short_name="noble"
 
 bundle exec rake stemcell:build_os_image[ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz]
 ```
@@ -78,7 +78,7 @@ The arguments to the `stemcell:build_os_image` rake task follow:
 Rebuild the stemcell when you are making and testing BOSH-specific changes such as a new BOSH agent.
 
 ```bash
-export short_name="jammy"
+export short_name="noble"
 export build_number="0.0.8"
 
 bundle exec rake stemcell:build[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz,${build_number}]
@@ -114,7 +114,7 @@ the stemcell would be at
 upload the stemcell to a vSphere BOSH Director:
 
 ```bash
-export short_name="jammy"
+export short_name="noble"
 
 bosh upload-stemcell tmp/bosh-stemcell-0.0.8-vsphere-esxi-ubuntu-${short_name}-go_agent.tgz
 ```
@@ -135,7 +135,7 @@ the OS image** at the `tmp/ubuntu_base_image.tgz` and you're within the Docker
 container):
 
 ```shell
-  export short_name="jammy"
+  export short_name="noble"
   cd /opt/bosh/bosh-stemcell
   bundle install
   OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rspec -fd spec/os_image/ubuntu_spec.rb
@@ -208,7 +208,7 @@ If you find yourself debugging any of the above processes, here is what you need
    Example usage:
 
    ```shell
-   export short_name="jammy"
+   export short_name="noble"
 
    bundle exec rake stemcell:build_os_image[ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz] resume_from=rsyslog_config
    ```
@@ -249,7 +249,7 @@ You will need the ovftool installer present in
 Rebuild the container with:
 
 ```shell
-export short_name="jammy"
+export short_name="noble"
 
 docker build \
     --platform linux/amd64 \
@@ -280,7 +280,7 @@ gsutil cp MY_OVFTOOL_FILE gs://bosh-vmware-ovftool/MY_OS/
 Example:
 
 ```shell
-export short_name="jammy"
+export short_name="noble"
 
 gsutil cp VMware-ovftool-4.4.3-18663434-lin.x86_64.bundle gs://bosh-vmware-ovftool/${short_name}/
 ```

acceptance-tests/ipv4director/auditd/smoke_test.go

@@ -25,8 +25,8 @@ var _ = Describe("Auditd", func() {
 			"ssh", "os-conf-auditd/0", "-r", "-c",
 			`sudo auditctl -w /etc/network -p wa -k system-locale-story-50315687`,
 		)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(exitStatus).To(Equal(0))
+		Expect(err).To(HaveOccurred())
+		Expect(exitStatus).To(Equal(1))
 		Expect(stdout).To(ContainSubstring(immutabilityError))
 	})
 

acceptance-tests/ipv4director/ipv6basic/basic_test.go

@@ -7,11 +7,10 @@ import (
 
 var _ = Describe("IPv6 Basic", func() {
 	It("enables ipv6 in the kernel", func() {
-		stdOut, _, exitStatus, err := bosh.Run("--column=stdout", "ssh", "test/0", "-r", "-c", `sudo netstat -lnp | grep sshd`)
+		stdOut, _, exitStatus, err := bosh.Run("--column=stdout", "ssh", "test/0", "-r", "-c", `sudo ip a | grep inet6`)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(exitStatus).To(Equal(0))
-		Expect(stdOut).To(ContainSubstring("0.0.0.0:22"))
-		Expect(stdOut).To(ContainSubstring(":::22"))
+		Expect(stdOut).To(ContainSubstring("inet6 ::1/128 scope host"))
 	})
 
 	It("assigns link local ipv6 address", func() {

acceptance-tests/ipv4director/ipv6basic/manifest.yml

@@ -23,7 +23,3 @@ instance_groups:
   - {name: default}
   azs: [z1]
   jobs: []
-  env:
-    bosh:
-      ipv6:
-        enable: true

acceptance-tests/ipv4director/smoke/smoke_test.go

@@ -95,11 +95,10 @@ var _ = Describe("Stemcell", func() {
 		Expect(offending).To(BeEmpty(), "auth.log contained 'No such file or directory':\n%s", strings.Join(offending, "\n"))
 	})
 
-	It("#141987897: disables ipv6 in the kernel", func() {
-		stdOut, _, exitStatus, err := bosh.Run("--column=stdout", "ssh", "default/0", "-r", "-c", `sudo netstat -lnp | grep sshd | awk '{ print $4 }'`)
+	It("#141987897: has ipv6 enabled in the kernel", func() {
+		_, _, exitStatus, err := bosh.Run("--column=stdout", "ssh", "default/0", "-r", "-c", `sudo ip a | grep inet6`)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(exitStatus).To(Equal(0))
-		Expect(strings.Split(strings.TrimSpace(stdOut), "\n")).To(Equal([]string{"0.0.0.0:22"}))
 	})
 
 	It("#140456537: enables sysstat", func() {

acceptance-tests/ipv6director/ipv6full/full_test.go

@@ -11,11 +11,11 @@ import (
 
 var _ = Describe("IPv6 Full", func() {
 	It("enables ipv6 in the kernel", func() {
-		stdOut, _, exitStatus, err := bosh.Run("--column=stdout", "ssh", "test/0", "-r", "-c", `sudo netstat -lnp | grep sshd`)
+		stdOut, _, exitStatus, err := bosh.Run("--column=stdout", "ssh", "test/0", "-r", "-c", `sudo ip a | grep inet6`)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(exitStatus).To(Equal(0))
-		Expect(stdOut).To(ContainSubstring("0.0.0.0:22"))
-		Expect(stdOut).To(ContainSubstring(":::22"))
+		Expect(stdOut).To(ContainSubstring("inet6 ::1/128 scope host"))
+		Expect(stdOut).To(ContainSubstring("scope link"))
 	})
 
 	type Instance struct {

bosh-stemcell/lib/bosh/stemcell/build_environment.rb

@@ -177,8 +177,6 @@ def exclude_exclusions
           " --tag ~exclude_on_alicloud"
         when "vsphere"
           " --tag ~exclude_on_vsphere"
-        when "vcloud"
-          " --tag ~exclude_on_vcloud"
         when "warden"
           " --tag ~exclude_on_warden"
         when "aws"
@@ -189,8 +187,6 @@ def exclude_exclusions
           " --tag ~exclude_on_cloudstack"
         when "azure"
           " --tag ~exclude_on_azure"
-        when "softlayer"
-          " --tag ~exclude_on_softlayer"
         when "google"
           " --tag ~exclude_on_google"
         end,

bosh-stemcell/lib/bosh/stemcell/builder_options.rb

@@ -51,7 +51,7 @@ def default
     )
 
     def ovf_options
-      if infrastructure.name == "vsphere" || infrastructure.name == "vcloud"
+      if infrastructure.name == "vsphere"
         {"image_ovftool_path" => environment["OVFTOOL"]}
       else
         {}