testjsnapp/test-freebsd-12

Signed-off-by: Jeremiah Snapp <jeremiah@chef.io>

4 files changed, 9 insertions, 4 deletions

diff --git a/.expeditor/adhoc-canary.omnibus.yml b/.expeditor/adhoc-canary.omnibus.yml
index efd4690ca9..08859dbb1e 100644
--- a/.expeditor/adhoc-canary.omnibus.yml
+++ b/.expeditor/adhoc-canary.omnibus.yml
@@ -3,6 +3,8 @@ project-name: chef
 config: omnibus/omnibus.rb
 test-path: omnibus/omnibus-test.sh
 test-path-windows: omnibus/omnibus-test.ps1
+test-channel: stable
+test-version: 17.9.18
 fips-platforms:
   - el-*-x86_64
   - el-*-ppc64*
diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
index 47b21ae431..b62746fcd2 100644
--- a/omnibus/omnibus-test.sh
+++ b/omnibus/omnibus-test.sh
@@ -116,6 +116,9 @@ fi
 # accept license
 export CHEF_LICENSE=accept-no-persist
 
+sudo cp spec/functional/resource/group_spec.rb /opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.18/spec/functional/resource/group_spec.rb
+# sudo cp spec/support/shared/functional/securable_resource_with_reporting.rb /opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.18/spec/support/shared/functional/securable_resource_with_reporting.rb
+
 cd "$chef_gem"
 sudo -E bundle install --jobs=3 --retry=3
 sudo -E bundle exec rspec --profile -f progress
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb
index 87953455b9..9360020537 100644
--- a/spec/functional/resource/group_spec.rb
+++ b/spec/functional/resource/group_spec.rb
@@ -425,7 +425,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
       end
     end
 
-    describe "when there is a group" do
+    describe "when there is a group", :not_supported_on_freebsd_gte_12_3 do
       it_behaves_like "correct group management"
     end
 
@@ -463,7 +463,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
       end
     end
 
-    describe "when there is a group" do
+    describe "when there is a group", :not_supported_on_freebsd_gte_12_3 do
       it_behaves_like "correct group management"
     end
 
diff --git a/spec/support/shared/functional/securable_resource_with_reporting.rb b/spec/support/shared/functional/securable_resource_with_reporting.rb
index 02fd3e6cb7..6f816265bf 100644
--- a/spec/support/shared/functional/securable_resource_with_reporting.rb
+++ b/spec/support/shared/functional/securable_resource_with_reporting.rb
@@ -112,7 +112,7 @@ shared_examples_for "a securable resource with reporting" do
         end
       end
 
-      context "and group is specified with a String (group name)", :not_supported_on_freebsd_gte_12_3, requires_root: true do
+      context "and group is specified with a String (group name)", requires_root: true do
 
         let(:expected_group_name) { Etc.getgrent.name }
 
@@ -127,7 +127,7 @@ shared_examples_for "a securable resource with reporting" do
 
       end
 
-      context "and group is specified with an Integer (gid)", :not_supported_on_freebsd_gte_12_3, requires_root: true do
+      context "and group is specified with an Integer (gid)", requires_root: true do
         let(:expected_gid) { Etc.getgrent.gid }
 
         before do