From 95c863e162df016c408ca2a6bb8203a1c9a28507 Mon Sep 17 00:00:00 2001 From: Poornima <94897054+poorndm@users.noreply.github.com> Date: Wed, 13 Jul 2022 18:36:14 +0530 Subject: Skip test on FreeBsd 13 Signed-off-by: Poornima <94897054+poorndm@users.noreply.github.com> --- .expeditor/adhoc-canary.omnibus.yml | 116 ++++++++++++++++----------------- knife/spec/support/platform_helpers.rb | 4 ++ spec/functional/resource/group_spec.rb | 4 +- spec/spec_helper.rb | 1 + spec/support/platform_helpers.rb | 4 ++ 5 files changed, 69 insertions(+), 60 deletions(-) diff --git a/.expeditor/adhoc-canary.omnibus.yml b/.expeditor/adhoc-canary.omnibus.yml index 10617b5989..1f8601671c 100644 --- a/.expeditor/adhoc-canary.omnibus.yml +++ b/.expeditor/adhoc-canary.omnibus.yml @@ -15,22 +15,22 @@ builder-to-testers-map: # aix-7.1-powerpc: # - aix-7.1-powerpc # - aix-7.2-powerpc - amazon-2022-aarch64: - - amazon-2022-aarch64 - amazon-2022-x86_64: - - amazon-2022-x86_64 - debian-9-x86_64: - - debian-9-x86_64 - - debian-10-x86_64 - - debian-11-x86_64 - debian-10-aarch64: - - debian-10-aarch64 - - debian-11-aarch64 - el-6-x86_64: - - el-6-x86_64 - el-7-aarch64: - - el-7-aarch64 - - amazon-2-aarch64 + # amazon-2022-aarch64: + # - amazon-2022-aarch64 + # amazon-2022-x86_64: + # - amazon-2022-x86_64 + # debian-9-x86_64: + # - debian-9-x86_64 + # - debian-10-x86_64 + # - debian-11-x86_64 + # debian-10-aarch64: + # - debian-10-aarch64 + # - debian-11-aarch64 + # el-6-x86_64: + # - el-6-x86_64 + # el-7-aarch64: + # - el-7-aarch64 + # - amazon-2-aarch64 # el-7-ppc64: # - el-7-ppc64 # el-7-ppc64le: @@ -38,56 +38,56 @@ builder-to-testers-map: # el-7-s390x: # - el-7-s390x # - el-8-s390x - el-7-x86_64: - - el-7-x86_64 - - amazon-2-x86_64 - el-8-aarch64: - - el-8-aarch64 - el-8-x86_64: - - el-8-x86_64 - el-9-aarch64: - - el-9-aarch64 - el-9-x86_64: - - el-9-x86_64 + # el-7-x86_64: + # - el-7-x86_64 + # - amazon-2-x86_64 + # el-8-aarch64: + # - el-8-aarch64 + # el-8-x86_64: + # - el-8-x86_64 + # el-9-aarch64: + # - el-9-aarch64 + # el-9-x86_64: + # - el-9-x86_64 freebsd-12-amd64: - freebsd-12-amd64 - freebsd-13-amd64 - mac_os_x-10.15-x86_64: - - mac_os_x-10.15-x86_64 - - mac_os_x-11-x86_64 - - mac_os_x-12-x86_64 - mac_os_x-11-arm64: - - mac_os_x-11-arm64 + # mac_os_x-10.15-x86_64: + # - mac_os_x-10.15-x86_64 + # - mac_os_x-11-x86_64 + # - mac_os_x-12-x86_64 + # mac_os_x-11-arm64: + # - mac_os_x-11-arm64 # - mac_os_x-12-arm64 canary org doesn't yet have a macos 12 arm64 omnibus worker # sles-12-s390x: # - sles-12-s390x # - sles-15-s390x - sles-12-x86_64: - - sles-12-x86_64 - - sles-15-x86_64 - sles-15-aarch64: - - sles-15-aarch64 + # sles-12-x86_64: + # - sles-12-x86_64 + # - sles-15-x86_64 + # sles-15-aarch64: + # - sles-15-aarch64 # solaris2-5.11-i386: # - solaris2-5.11-i386 # solaris2-5.11-sparc: # - solaris2-5.11-sparc - ubuntu-18.04-aarch64: - - ubuntu-18.04-aarch64 - - ubuntu-20.04-aarch64 - - ubuntu-22.04-aarch64 - ubuntu-16.04-x86_64: - - ubuntu-16.04-x86_64 - - ubuntu-18.04-x86_64 - - ubuntu-20.04-x86_64 - - ubuntu-22.04-x86_64 - windows-2012r2-i386: - - windows-2012r2-i386 - windows-2012r2-x86_64: - - windows-2012-x86_64 - - windows-2012r2-x86_64 - - windows-2016-x86_64 - - windows-2019-x86_64 - - windows-2022-x86_64 - - windows-8-x86_64 - - windows-10-x86_64 - - windows-11-x86_64 + # ubuntu-18.04-aarch64: + # - ubuntu-18.04-aarch64 + # - ubuntu-20.04-aarch64 + # - ubuntu-22.04-aarch64 + # ubuntu-16.04-x86_64: + # - ubuntu-16.04-x86_64 + # - ubuntu-18.04-x86_64 + # - ubuntu-20.04-x86_64 + # - ubuntu-22.04-x86_64 + # windows-2012r2-i386: + # - windows-2012r2-i386 + # windows-2012r2-x86_64: + # - windows-2012-x86_64 + # - windows-2012r2-x86_64 + # - windows-2016-x86_64 + # - windows-2019-x86_64 + # - windows-2022-x86_64 + # - windows-8-x86_64 + # - windows-10-x86_64 + # - windows-11-x86_64 diff --git a/knife/spec/support/platform_helpers.rb b/knife/spec/support/platform_helpers.rb index 4d3acbcb33..1f36a0fbcc 100644 --- a/knife/spec/support/platform_helpers.rb +++ b/knife/spec/support/platform_helpers.rb @@ -127,6 +127,10 @@ def freebsd? RUBY_PLATFORM.include?("freebsd") end +def freebsd_gte_12_3? + RUBY_PLATFORM.include?("freebsd") && !!(ohai[:platform_version].to_f >= 12.3) +end + def intel_64bit? !!(ohai[:kernel][:machine] == "x86_64") end diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb index 87953455b9..3da0af5d98 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/spec_helper.rb b/spec/spec_helper.rb index 2aa3b2a1cd..bbf52b95fd 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -144,6 +144,7 @@ RSpec.configure do |config| config.filter_run_excluding macos_only: true unless macos? config.filter_run_excluding not_macos_gte_11: true if macos_gte_11? config.filter_run_excluding not_supported_on_aix: true if aix? + config.filter_run_excluding not_supported_on_freebsd_gte_12_3: true if freebsd_gte_12_3? config.filter_run_excluding not_supported_on_solaris: true if solaris? config.filter_run_excluding not_supported_on_gce: true if gce? config.filter_run_excluding win2012r2_only: true unless windows_2012r2? diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index 430d9b055f..6ed0945286 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -127,6 +127,10 @@ def freebsd? RUBY_PLATFORM.include?("freebsd") end +def freebsd_gte_12_3? + RUBY_PLATFORM.include?("freebsd") && !!(ohai[:platform_version].to_f >= 12.3) +end + def intel_64bit? !!(ohai[:kernel][:machine] == "x86_64") end -- cgit v1.2.1