Merge pull request #545 from cloudfoundry/merge-jammy

Merge jammy

Bypassing because EasyCLA is choking on commits already accepted.

Author: aramprice

.bundle/config

@@ -11,5 +11,5 @@ jobs:
     - name: test-bosh-stemcell
       run: |
         bundle install
-        bundle exec rspec
+        bundle exec rake
       working-directory: bosh-stemcell/

.gitattributes

@@ -49,7 +49,7 @@ jobs:
           mv tmp.sarif trivy-results-${n}.sarif
         done
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         name: sbom
         path: sbom.spdx.json

.github/workflows/ruby.yml

@@ -1,12 +1,4 @@
 source 'https://rubygems.org'
 
-group :development, :test do
-  gem 'bosh-stemcell', path: 'bosh-stemcell'
-  gem 'fakefs'
-  gem 'logging'
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-instafail'
-  gem 'rspec-its'
-  gem 'timecop'
-end
+gem 'rake'
+gem 'bosh-stemcell', path: 'bosh-stemcell'

.github/workflows/sbom.yml

@@ -2,17 +2,14 @@ PATH
   remote: bosh-stemcell
   specs:
     bosh-stemcell (0.0.0)
+      rake
+      rspec
+      rspec-its
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.6.2)
-    fakefs (3.2.1)
-    little-plugger (1.1.4)
-    logging (2.4.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.14)
-    multi_json (1.20.0)
     rake (13.3.1)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -23,29 +20,20 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-instafail (1.0.0)
-      rspec
     rspec-its (2.0.0)
       rspec-core (>= 3.13.0)
       rspec-expectations (>= 3.13.0)
     rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    timecop (0.9.10)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bosh-stemcell!
-  fakefs
-  logging
   rake
-  rspec
-  rspec-instafail
-  rspec-its
-  timecop
 
 BUNDLED WITH
    2.5.23

.rubocop.yml

@@ -137,6 +137,7 @@ container):
 ```shell
   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_${short_name}_spec.rb
 ```
 
@@ -150,6 +151,7 @@ container, you should be able to run the specific tests:
 
 ```shell
 cd /opt/bosh/bosh-stemcell; \
+bundle install; \
 STEMCELL_IMAGE=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/vsphere-esxi-ubuntu.raw \
 STEMCELL_WORKDIR=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/chroot \
 OS_NAME=ubuntu \
@@ -173,25 +175,19 @@ an ubuntu chroot environment to run. For this reason, we use the
 locally, run:
 
 ```shell
-bundle install --local
 cd /opt/bosh/bosh-stemcell
-OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rspec spec/ --tag shellout_types
-```
-
-If on macOS, run:
-
-```shell
-OSX=true OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rspec spec/ --tag shellout_types
+bundle install
+OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rake spec:shellout_types
 ```
 
 ### How to run tests for BOSH Linux Stemcell Builder
 
 The BOSH Linux Stemcell Builder code itself can be tested with the following command's:
 
 ```shell
-bundle install --local
 cd /opt/bosh/bosh-stemcell
-bundle exec rspec spec/
+bundle install
+bundle exec rake
 ```
 
 ## Troubleshooting

Gemfile

@@ -1,5 +1,4 @@
 require 'json'
-require 'logging'
 
 namespace :stemcell do
   desc 'Build a base OS image for use in stemcells'