diff options
| -rwxr-xr-x | buildscripts/packager.py | 18 | ||||
| -rw-r--r-- | debian/mongod.service | 4 | ||||
| -rw-r--r-- | etc/evergreen.yml | 20 |
3 files changed, 26 insertions, 16 deletions
diff --git a/buildscripts/packager.py b/buildscripts/packager.py index b6d55d0fc9f..3bb1fbcc8b5 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -216,6 +216,8 @@ class Distro(object): elif self.n == 'debian': if build_os == 'debian71': return 'wheezy' + elif build_os == 'debian81': + return 'jessie' else: raise Exception("unsupported build_os: %s" % build_os) else: @@ -246,7 +248,7 @@ class Distro(object): elif self.n == 'ubuntu': return [ "ubuntu1204", "ubuntu1404" ] elif self.n == 'debian': - return [ "debian71" ] + return [ "debian71", "debian81" ] else: raise Exception("BUG: unsupported platform?") @@ -453,11 +455,17 @@ def make_deb(distro, build_os, arch, spec, srcdir): suffix=spec.suffix() sdir=setupdir(distro, build_os, arch, spec) if re.search("debian", distro.name()): - os.link(sdir+"debian/init.d", sdir+"debian/%s%s-server.mongod.init" % (distro.pkgbase(), suffix)) os.unlink(sdir+"debian/mongod.upstart") + if build_os == "debian71": + os.link(sdir+"debian/init.d", sdir+"debian/%s%s-server.mongod.init" % (distro.pkgbase(), suffix)) + os.unlink(sdir+"debian/mongod.service") + else: + os.link(sdir+"debian/mongod.service", sdir+"debian/%s%s-server.mongod.service" % (distro.pkgbase(), suffix)) + os.unlink(sdir+"debian/init.d") elif re.search("ubuntu", distro.name()): os.link(sdir+"debian/mongod.upstart", sdir+"debian/%s%s-server.mongod.upstart" % (distro.pkgbase(), suffix)) os.unlink(sdir+"debian/init.d") + os.unlink(sdir+"debian/mongod.service") else: raise Exception("unknown debianoid flavor: not debian or ubuntu?") # Rewrite the control and rules files @@ -647,7 +655,7 @@ def make_rpm(distro, build_os, arch, spec, srcdir): # all of this is to let us do our work with some guarantee that # we're not clobbering anything that doesn't belong to us. # - # On RHEL systems, --rcfile will generally be used and + # On RHEL systems, --rcfile will generally be used and # --macros will be used in Ubuntu. # macrofiles=[l for l in backtick(["rpm", "--showrc"]).split("\n") if l.startswith("macrofiles")] @@ -668,7 +676,7 @@ def make_rpm(distro, build_os, arch, spec, srcdir): # Put the specfile and the tar'd up binaries and stuff in # place. # - # The version of rpm and rpm tools in RHEL 5.5 can't interpolate the + # The version of rpm and rpm tools in RHEL 5.5 can't interpolate the # %{dynamic_version} macro, so do it manually with open(specfile, "r") as spec_source: with open(topdir+"SPECS/" + os.path.basename(specfile), "w") as spec_dest: @@ -736,5 +744,3 @@ def is_valid_file(parser, filename): if __name__ == "__main__": main(sys.argv) - - diff --git a/debian/mongod.service b/debian/mongod.service index 4c9e6c72cdb..6113d456c59 100644 --- a/debian/mongod.service +++ b/debian/mongod.service @@ -4,8 +4,8 @@ After=network.target Documentation=https://docs.mongodb.org/manual [Service] -User=mongod -Group=mongod +User=mongodb +Group=mongodb ExecStart=/usr/bin/mongod --quiet --config /etc/mongod.conf [Install] diff --git a/etc/evergreen.yml b/etc/evergreen.yml index a8f2a46d257..dd6366a5d93 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -73,6 +73,7 @@ variables: - enterprise-ubuntu1404-64 - enterprise-ubuntu1504-ppc64le - enterprise-debian71-64 + - enterprise-debian81-64 - linux-32 - linux-64 - amazon @@ -84,6 +85,7 @@ variables: - ubuntu1204 - ubuntu1404 - debian71 + - debian81 - solaris-64-bit - osx @@ -98,6 +100,7 @@ variables: - enterprise-ubuntu1404-64 - enterprise-ubuntu1504-ppc64le - enterprise-debian71-64 + - enterprise-debian81-64 - rhel55 - rhel62 - rhel70 @@ -107,6 +110,7 @@ variables: - ubuntu1404 - amazon - debian71 + - debian81 ####################################### # Functions # @@ -5134,7 +5138,7 @@ buildvariants: push_arch: x86_64-enterprise-debian81 compile_flags: --ssl MONGO_DISTMOD=debian81 --release -j$(grep -c ^processor /proc/cpuinfo) CC=/opt/mongodbtoolchain/bin/gcc CXX=/opt/mongodbtoolchain/bin/g++ num_jobs_available: $(grep -c ^processor /proc/cpuinfo) - has_packages: false + has_packages: true packager_script: packager-enterprise.py packager_arch: x86_64 packager_distro: debian81 @@ -5164,9 +5168,9 @@ buildvariants: - name: ssl - name: sslSpecial - name: unittests - # - name: push - # distros: - # - rhel55-test + - name: push + distros: + - rhel55-test - name: debian71 @@ -5298,7 +5302,7 @@ buildvariants: push_arch: x86_64-debian81 compile_flags: --ssl MONGO_DISTMOD=debian81 -j$(grep -c ^processor /proc/cpuinfo) --release CC=/opt/mongodbtoolchain/bin/gcc CXX=/opt/mongodbtoolchain/bin/g++ num_jobs_available: $(grep -c ^processor /proc/cpuinfo) - has_packages: false + has_packages: true packager_script: packager.py packager_arch: x86_64 packager_distro: debian81 @@ -5392,9 +5396,9 @@ buildvariants: - name: tool - name: tool_WT - name: unittests - # - name: push - # distros: - # - rhel55-test + - name: push + distros: + - rhel55-test ################################ |