From 6f7dae919422dcd7f4892c10ff20cdc721ad00e6 Mon Sep 17 00:00:00 2001
From: Brian McCarthy <brian.mccarthy@mongodb.com>
Date: Wed, 11 May 2022 20:47:42 +0000
Subject: SERVER-66386 Update AMI images for package tests

(cherry picked from commit 558e2dfd2cc4d4a7e87b321d1a65c89a23984b17)
---
 buildscripts/package_test/kitchen.yml                |  6 +++---
 buildscripts/package_test/recipes/install_mongodb.rb | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/buildscripts/package_test/kitchen.yml b/buildscripts/package_test/kitchen.yml
index 78f46351663..4af9e93e0b1 100644
--- a/buildscripts/package_test/kitchen.yml
+++ b/buildscripts/package_test/kitchen.yml
@@ -23,7 +23,7 @@ provisioner:
   name: chef_zero
   log_level: info
   product_name: cinc
-  product_version: 16.7.61
+  product_version: 17.9.52
   download_url: https://omnitruck.cinc.sh/install.sh
 
 platforms:
@@ -34,7 +34,7 @@ platforms:
       username: ec2-user
   - name: amazon2-x86-64
     driver:
-      image_id: ami-428aa838
+      image_id: ami-02013ed1a71752ea7
     transport:
       username: ec2-user
   - name: amazon2-arm64
@@ -70,7 +70,7 @@ platforms:
       username: admin
   - name: rhel70-x86-64
     driver:
-      image_id: ami-2051294a
+      image_id: ami-0051b1b2c5a166c8c
     transport:
       username: root
   - name: rhel80-x86-64
diff --git a/buildscripts/package_test/recipes/install_mongodb.rb b/buildscripts/package_test/recipes/install_mongodb.rb
index a13bccbad8d..1e857627f1e 100644
--- a/buildscripts/package_test/recipes/install_mongodb.rb
+++ b/buildscripts/package_test/recipes/install_mongodb.rb
@@ -51,11 +51,21 @@ if platform_family? 'debian'
   ENV['DEBIAN_FRONTEND'] = 'noninteractive'
   package 'openssl'
 
-  # the ubuntu 16.04 image does not have some dependencies installed by default
+  # the ubuntu image does not have some dependencies installed by default
   # and it is required for the install_compass script
-  execute 'install dependencies' do
-    command 'apt-get install -y python libsasl2-modules-gssapi-mit'
-    live_stream true
+  if node['platform'] == 'ubuntu' and node['platform_version'] == '20.04'
+    execute 'install dependencies ubuntu 20.04' do
+      command 'apt-get install -y python3 libsasl2-modules-gssapi-mit'
+      live_stream true
+    end
+    link '/usr/bin/python' do
+      to '/usr/bin/python3'
+    end
+  else
+    execute 'install dependencies' do
+      command 'apt-get install -y python libsasl2-modules-gssapi-mit'
+      live_stream true
+    end
   end
 
   # dpkg returns 1 if dependencies are not satisfied, which they will not be
-- 
cgit v1.2.1