SERVER-50465 Package tests not run on ARM hosts

3 files changed, 33 insertions, 42 deletions

diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml
index af04aa666a1..339d41957aa 100644
--- a/buildscripts/package_test/.kitchen.yml
+++ b/buildscripts/package_test/.kitchen.yml
@@ -20,10 +20,11 @@ verifier:
   sudo: true
 
 provisioner:
-  name: chef_solo
-  require_chef_omnibus: 15
-  chef_license: accept
+  name: chef_zero
   log_level: info
+  product_name: cinc
+  product_version: 16.7.61
+  download_url: https://omnitruck.cinc.sh/install.sh
 
 platforms:
   - name: amazon-x86-64
diff --git a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
index 0f848db7f9e..0a917e96021 100644
--- a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
+++ b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
@@ -31,16 +31,6 @@ describe command("#{service} mongod stop") do
   its('exit_status') { should eq 0 }
 end
 
-if (os[:name] == 'amazon' and os[:release] == '2.0')
-  describe systemd_service('mongod') do
-    it { should_not be_running }
-  end
-else
-  describe service('mongod') do
-    it { should_not be_running }
-  end
-end
-
 describe command("#{service} mongod restart") do
   its('exit_status') { should eq 0 }
 end
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 4910a467051..94aa1acb8ec 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -8735,7 +8735,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu1804-small
@@ -8795,7 +8795,7 @@ buildvariants:
   - name: .watchdog
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu1804-small
@@ -8870,7 +8870,7 @@ buildvariants:
   - name: .ssl
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu1604-small
@@ -8964,7 +8964,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu1804-test
@@ -8998,7 +8998,7 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu1804-test
@@ -9204,7 +9204,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu2004-small
@@ -9259,7 +9259,7 @@ buildvariants:
   - name: snmp
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu2004-small
@@ -9310,7 +9310,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu2004-test
@@ -9343,7 +9343,7 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu2004-test
@@ -9398,7 +9398,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - amazon1-2018-small
@@ -9450,7 +9450,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - amazon1-2018-small
@@ -9505,7 +9505,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - amazon2-small
@@ -9558,7 +9558,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - amazon2-small
@@ -9611,7 +9611,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel80-small
@@ -9658,7 +9658,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel80-small
@@ -10349,7 +10349,7 @@ buildvariants:
       - rhel62-large
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
 
 - &enterprise-rhel-80-64-bit-dynamic-required-template
@@ -11137,7 +11137,7 @@ buildvariants:
   - name: unittest_shell_hang_analyzer_gen
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel70-small
@@ -11216,7 +11216,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel80-small
@@ -11269,7 +11269,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel80-small
@@ -11446,7 +11446,7 @@ buildvariants:
   - name: .ssl
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel62-small
@@ -11496,7 +11496,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel70-small
@@ -11546,7 +11546,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel80-small
@@ -11593,7 +11593,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - rhel80-small
@@ -12013,7 +12013,7 @@ buildvariants:
   - name: .watchdog
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - ubuntu1604-small
@@ -12083,7 +12083,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - suse12-small
@@ -12378,7 +12378,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - debian92-small
@@ -12428,7 +12428,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - debian92-small
@@ -12474,7 +12474,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - debian10-small
@@ -12524,7 +12524,7 @@ buildvariants:
   - name: .stitch
   - name: test_packages
     distros:
-    - ubuntu2004-packer
+    - ubuntu2004-package
   - name: .publish
     distros:
     - debian10-small