SERVER-49222 ARM64 support on Amazon Linux 2

4 files changed, 31 insertions, 20 deletions

diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml
index 46ccb1659d9..1203ee05af7 100644
--- a/buildscripts/package_test/.kitchen.yml
+++ b/buildscripts/package_test/.kitchen.yml
@@ -21,92 +21,98 @@ verifier:
 
 provisioner:
   name: chef_solo
-  require_chef_omnibus: 12.6.0
+  require_chef_omnibus: 12
 
 platforms:
-  - name: amazon
+  - name: amazon-x86-64
     driver:
       image_id: ami-c481fad3
     transport:
       username: ec2-user
-  - name: amazon2
+  - name: amazon2-x86-64
     driver:
       image_id: ami-428aa838
     transport:
       username: ec2-user
-  - name: debian71
+  - name: amazon2-arm64
+    driver:
+      image_id: ami-0c582118883b46f4f
+      instance_type: c6g.medium
+    transport:
+      username: ec2-user
+  - name: debian71-x86-64
     driver:
       image_id: ami-4b124a22
     transport:
       username: admin
-  - name: debian81
+  - name: debian81-x86-64
     driver:
       image_id: ami-896d85e2
     transport:
       username: admin
-  - name: debian92
+  - name: debian92-x86-64
     driver:
       image_id: ami-71b7750b
     transport:
       username: admin
-  - name: debian10
+  - name: debian10-x86-64
     driver:
       image_id: ami-02ad06066b040a84b
     transport:
       username: admin
-  - name: rhel62
+  - name: rhel62-x86-64
     driver:
       # Use rhel 6.5 chef fails on previous versions.
       image_id: ami-5b697332
     transport:
       username: root
       instance_type: t2.small
-  - name: rhel70
+  - name: rhel70-x86-64
     driver:
       image_id: ami-60a1e808
     transport:
       username: root
-  - name: rhel80
+  - name: rhel80-x86-64
     driver:
       image_id: ami-0c322300a1dd5dc79
     transport:
       username: ec2-user
-  - name: suse11
+  - name: suse11-x86-64
     driver:
       image_id: ami-7f2e6015
     transport:
       username: ec2-user
-  - name: suse12
+  - name: suse12-x86-64
     driver:
       image_id: ami-043eebeabcc4e3d35
     transport:
       username: ec2-user
-  - name: suse15
+  - name: suse15-x86-64
     driver:
       image_id: ami-06ea7729e394412c8
     transport:
       username: ec2-user
-  - name: ubuntu1204
+  - name: ubuntu1204-x86-64
     driver:
       image_id: ami-3fec7956
     transport:
       username: ubuntu
-  - name: ubuntu1404
+  - name: ubuntu1404-x86-64
     driver:
       image_id: ami-1d8c9574
     transport:
       username: ubuntu
-  - name: ubuntu1604
+  - name: ubuntu1604-x86-64
     driver:
       image_id: ami-64140d0e
     transport:
       username: ubuntu
-  - name: ubuntu1804
+  - name: ubuntu1804-x86-64
     driver:
       image_id: ami-7ad76705
     transport:
       username: ubuntu
-  - name: ubuntu2004
+  - name: ubuntu2004-x86-64
     driver:
       image_id: ami-068663a3c619dd892
     transport:
diff --git a/buildscripts/package_test/recipes/install_mongodb.rb b/buildscripts/package_test/recipes/install_mongodb.rb
index ba0a5bf1456..a6294da8dd5 100644
--- a/buildscripts/package_test/recipes/install_mongodb.rb
+++ b/buildscripts/package_test/recipes/install_mongodb.rb
@@ -89,6 +89,9 @@ if platform_family? 'debian'
 end
 
 if platform_family? 'rhel'
+  bash 'wait for yum updates if they are running' do
+    sleep 120
+  end
   execute 'install mongod' do
     command 'yum install -y `find . -name "*server*.rpm"`'
     live_stream true
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 0f51ab4fea4..0f848db7f9e 100644
--- a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
+++ b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
@@ -59,13 +59,13 @@ if os[:arch] == 'x86_64' and
   ((os[:name] == 'ubuntu' and os[:release].split('.')[0].to_i > 12) or 
     (os[:family] == 'redhat' and os[:release].split('.')[0].to_i >= 7) or 
     (os[:name] == 'debian' and os[:release].split('.')[0].to_i >= 10) or
-    os[:name] == 'amazon')
+    (os[:name] == 'amazon'))
   describe command("install_compass") do
     its('exit_status') { should eq 0 }
   end
 else
   describe command("install_compass") do
-    its('exit_status') { should_not eq 0 }
+    its('stdout') { should match /open a ticket on the SERVER project/ }
   end
 end
 
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py
index 9d2b0d1ff99..4bbbfb4b738 100755
--- a/buildscripts/packager_enterprise.py
+++ b/buildscripts/packager_enterprise.py
@@ -140,6 +140,8 @@ class EnterpriseDistro(packager.Distro):
         if arch == "aarch64":
             if self.dname == 'redhat':
                 return ["rhel82"]
+            if self.dname == 'amazon2':
+                return ["amazon2"]
             return []
 
         if re.search("(redhat|fedora|centos)", self.dname):