summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorBrian McCarthy <brian.mccarthy@mongodb.com>2020-04-24 19:51:05 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-05-04 21:24:06 +0000
commit11fd7943b2cc29c189ddd919a21677d4ce50a933 (patch)
treef258383afbe79df1e5d6b1203842ce8d3a8301c8 /buildscripts
parent37dd62061cd41843646ab5b3eb91f29716117196 (diff)
downloadmongo-11fd7943b2cc29c189ddd919a21677d4ce50a933.tar.gz
SERVER-44070 Platform Support: Add Community & Enterprise Ubuntu 20.04 x64
(cherry picked from commit a7653f2540a79cbbdb313a0c13be501fadc30878)
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/package_test/.kitchen.yml5
-rw-r--r--buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb3
-rwxr-xr-xbuildscripts/packager.py3
3 files changed, 10 insertions, 1 deletions
diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml
index d9e6a41d5f1..66ac4488f8c 100644
--- a/buildscripts/package_test/.kitchen.yml
+++ b/buildscripts/package_test/.kitchen.yml
@@ -105,6 +105,11 @@ platforms:
image_id: ami-7ad76705
transport:
username: ubuntu
+ - name: ubuntu2004
+ driver:
+ image_id: ami-068663a3c619dd892
+ transport:
+ username: ubuntu
transport:
ssh_key: ~/.ssh/kitchen.pem
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 be53465b0c1..f5cc9799569 100644
--- a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
+++ b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
@@ -151,7 +151,8 @@ if deb
# account shells
its('shell') {
if ((os[:name] == 'debian' and os[:release].split('.')[0] == '10') or
- (os[:name] == 'ubuntu' and os[:release] == '18.04'))
+ (os[:name] == 'ubuntu' and os[:release] == '18.04') or
+ (os[:name] == 'ubuntu' and os[:release] == '20.04'))
should eq '/usr/sbin/nologin'
else
should eq '/bin/false'
diff --git a/buildscripts/packager.py b/buildscripts/packager.py
index 53ae83c6c10..da64402d347 100755
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@@ -293,6 +293,8 @@ class Distro(object):
return "xenial"
elif build_os == 'ubuntu1804':
return "bionic"
+ elif build_os == 'ubuntu2004':
+ return "focal"
else:
raise Exception("unsupported build_os: %s" % build_os)
elif self.dname == 'debian':
@@ -339,6 +341,7 @@ class Distro(object):
"ubuntu1404",
"ubuntu1604",
"ubuntu1804",
+ "ubuntu2004",
]
elif self.dname == 'debian':
return ["debian81", "debian92", "debian10"]