diff options
| author | Mathew Robinson <chasinglogic@gmail.com> | 2019-04-10 19:49:17 -0400 |
|---|---|---|
| committer | Mathew Robinson <chasinglogic@gmail.com> | 2019-04-29 13:39:57 -0400 |
| commit | 2bb9313de4c53d31051e30af49a1ead10535e5d2 (patch) | |
| tree | f409b97fe6fe83f08a906b870ce3b19b11b53e48 /buildscripts | |
| parent | c6eeaa4d0348ed3d8b213f893bf53c4d23724de5 (diff) | |
| download | mongo-2bb9313de4c53d31051e30af49a1ead10535e5d2.tar.gz | |
SERVER-37769 Platform Support: SUSE15
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/package_test/.kitchen.yml | 5 | ||||
| -rwxr-xr-x | buildscripts/packager.py | 13 | ||||
| -rwxr-xr-x | buildscripts/packager_enterprise.py | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/buildscripts/package_test/.kitchen.yml b/buildscripts/package_test/.kitchen.yml index b3d87242dde..3dc27c808b3 100644 --- a/buildscripts/package_test/.kitchen.yml +++ b/buildscripts/package_test/.kitchen.yml @@ -70,6 +70,11 @@ platforms: image_id: ami-aeb532c6 transport: username: ec2-user + - name: suse15 + driver: + image_id: ami-06ea7729e394412c8 + transport: + username: ec2-user - name: ubuntu1204 driver: image_id: ami-3fec7956 diff --git a/buildscripts/packager.py b/buildscripts/packager.py index 1ec0755feae..4064b5b152d 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -838,6 +838,19 @@ def make_rpm(distro, build_os, arch, spec, srcdir): # pylint: disable=too-many- "-D", "dynamic_version " + spec.pversion(distro), "-D", "dynamic_release " + spec.prelease(), "-D", "_topdir " + topdir ]) + + # Versions of RPM after 4.4 ignore our BuildRoot tag so we need to + # specify it on the command line args to rpmbuild + # + # Current versions of RHEL at the time of this writing (RHEL < 8) patch in + # the old behavior so that our BuildRoot tag still works on these versions. + # + # Probably need to add RHEL 8 to this when we start building for it + if distro.name() == "suse" and distro.repo_os_version(build_os) == "15": + flags.extend([ + "--buildroot", os.path.join(topdir, "BUILDROOT"), + ]) + sysassert(["rpmbuild", "-ba", "--target", distro_arch] + flags + ["%s/SPECS/mongodb%s.spec" % (topdir, suffix)]) repo_dir = distro.repodir(arch, build_os, spec) diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index 3e43850ee2c..9fbc2f0031b 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -130,7 +130,7 @@ class EnterpriseDistro(packager.Distro): if self.dname == 'redhat': return ["rhel67", "rhel72"] if self.dname == 'suse': - return ["suse11", "suse12"] + return ["suse11", "suse12", "suse15"] if self.dname == 'ubuntu': return ["ubuntu1604", "ubuntu1804"] return [] |