diff options
-rwxr-xr-x | buildscripts/packager.py | 16 | ||||
-rw-r--r-- | etc/evergreen.yml | 169 |
2 files changed, 5 insertions, 180 deletions
diff --git a/buildscripts/packager.py b/buildscripts/packager.py index adae9fe5f6d..db49462a668 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -242,9 +242,7 @@ class Distro(object): else: raise Exception("unsupported build_os: %s" % build_os) elif self.n == 'debian': - if build_os == 'debian71': - return 'wheezy' - elif build_os == 'debian81': + if build_os == 'debian81': return 'jessie' else: raise Exception("unsupported build_os: %s" % build_os) @@ -261,7 +259,7 @@ class Distro(object): def build_os(self, arch): """Return the build os label in the binary package to download ("rhel55", "rhel62" and "rhel70" - for redhat, "ubuntu1204" and "ubuntu1404" for Ubuntu, "debian71" for Debian), and "suse11" + for redhat, "ubuntu1204" and "ubuntu1404" for Ubuntu, "debian81" for Debian), and "suse11" for SUSE)""" # Community builds only support amd64 if arch not in ['x86_64', 'ppc64le']: @@ -276,7 +274,7 @@ class Distro(object): elif self.n == 'ubuntu': return [ "ubuntu1204", "ubuntu1404", "ubuntu1604", ] elif self.n == 'debian': - return [ "debian71", "debian81" ] + return [ "debian81" ] else: raise Exception("BUG: unsupported platform?") @@ -457,12 +455,8 @@ def make_deb(distro, build_os, arch, spec, srcdir): sdir=setupdir(distro, build_os, arch, spec) if re.search("debian", distro.name()): 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") + 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.unlink(sdir+"debian/init.d") if build_os in ("ubuntu1204", "ubuntu1404", "ubuntu1410"): diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 57d9717bada..ad05a08ae80 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -73,7 +73,6 @@ variables: - enterprise-ubuntu1204-64 - enterprise-ubuntu1404-64 - enterprise-ubuntu1604-64 - - enterprise-debian71-64 - enterprise-debian81-64 - linux-32 - linux-64 @@ -85,7 +84,6 @@ variables: - ubuntu1204 - ubuntu1404 - ubuntu1604 - - debian71 - debian81 - osx-108-ssl - osx-108 @@ -5088,58 +5086,6 @@ buildvariants: # Debian buildvariants # ########################################### -- name: enterprise-debian71-64 - display_name: Enterprise Debian 7.1 - modules: - - enterprise - - mongo-tools - run_on: - - debian71-test - batchtime: 1440 # 1 day - expansions: - gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH" - tooltags: "-tags 'ssl sasl'" - push_path: linux - push_bucket: downloads.10gen.com - push_name: linux - push_arch: x86_64-enterprise-debian71 - compile_flags: --ssl MONGO_DISTMOD=debian71 --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: true - packager_script: packager-enterprise.py - packager_arch: x86_64 - packager_distro: debian71 - repo_edition: enterprise - tasks: - - name: compile - distros: - - debian71-build - - name: audit - - name: audit_WT - - name: dbtest - - name: dbtest_WT - - name: ese_WT - - name: jsCore - - name: jsCore_auth - - name: jstestfuzz - - name: jstestfuzz_WT - - name: jstestfuzz_replication_WT - - name: jstestfuzz_sharded_WT - - name: mmap - - name: replicasets_auth - - name: sasl - - name: sharding_auth - - name: sharding_csrs_upgrade_auth_WT - - name: snmp - - name: snmp_WT - - name: ssl - - name: sslSpecial - - name: unittests - - name: package - distros: - - ubuntu1604-packer - - name: push - - name: enterprise-debian81-64 display_name: Enterprise Debian 8.1 modules: @@ -5193,121 +5139,6 @@ buildvariants: - name: push -- name: debian71 - display_name: SSL Debian 7.1 - modules: - - mongo-tools - run_on: - - debian71-test - batchtime: 1440 # 1 day - expansions: - gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH" - tooltags: "-tags ssl" - push_path: linux - push_bucket: downloads.mongodb.org - push_name: linux - push_arch: x86_64-debian71 - compile_flags: --ssl MONGO_DISTMOD=debian71 -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: true - packager_script: packager.py - packager_arch: x86_64 - packager_distro: debian71 - repo_edition: org - tasks: - - name: compile - distros: - - debian71-build - - name: aggregation - - name: aggregation_WT - - name: aggregation_auth - - name: auth - - name: auth_WT - - name: dbtest - - name: dbtest_WT - - name: disk - - name: durability - - name: dur_jscore_passthrough - - name: failpoints - - name: failpoints_auth - - name: gle_auth - - name: gle_auth_WT - - name: gle_auth_write_cmd - - name: gle_auth_write_cmd_WT - - name: gle_auth_basics_passthrough - - name: gle_auth_basics_passthrough_WT - - name: gle_auth_basics_passthrough_write_cmd - - name: gle_auth_basics_passthrough_write_cmd_WT - - name: sharding_gle_auth_basics_passthrough - - name: sharding_gle_auth_basics_passthrough_WT - - name: sharding_gle_auth_basics_passthrough_write_cmd - - name: sharding_gle_auth_basics_passthrough_write_cmd_WT - - name: jsCore - - name: jsCore_WT - - name: jsCore_auth - - name: jsCore_compatibility - - name: jsCore_compatibility_WT - - name: jsCore_small_oplog - - name: jsCore_small_oplog_WT - - name: jsCore_small_oplog_rs - - name: jsCore_small_oplog_rs_WT - - name: jstestfuzz - - name: jstestfuzz_WT - - name: jstestfuzz_replication_WT - - name: jstestfuzz_sharded_WT - - name: mmap - - name: mongosTest - - name: multiversion - - name: noPassthrough - - name: noPassthrough_WT - - name: noPassthroughWithMongod - - name: noPassthroughWithMongod_WT - - name: bulk_gle_passthrough - - name: bulk_gle_passthrough_WT - - name: parallel - - name: parallel_WT - - name: parallel_compatibility - - name: parallel_compatibility_WT - - name: concurrency - - name: concurrency_WT - - name: concurrency_replication - - name: concurrency_replication_WT - - name: concurrency_sharded - - name: concurrency_sharded_WT - - name: concurrency_sharded_sccc - - name: concurrency_sharded_sccc_WT - - name: replicasets - - name: replicasets_WT - - name: replicasets_auth - - name: replication - - name: replication_WT - - name: replication_auth - - name: sharding - - name: sharding_WT - - name: sharding_auth - - name: sharding_csrs_upgrade - - name: sharding_csrs_upgrade_WT - - name: sharding_csrs_upgrade_auth_WT - - name: sharding_legacy_multiversion - - name: slow1 - - name: slow1_WT - - name: slow2 - - name: slow2_WT - - name: sharded_collections_jscore_passthrough - - name: sharded_collections_jscore_passthrough_WT - - name: sharding_jscore_passthrough - - name: sharding_jscore_passthrough_WT - - name: sharding_jscore_passthrough_wire_ops_WT - - name: ssl - - name: sslSpecial - - name: tool - - name: tool_WT - - name: unittests - - name: package - distros: - - ubuntu1604-packer - - name: push - - name: debian81 display_name: SSL Debian 8.1 modules: |