diff options
-rwxr-xr-x | buildscripts/packager_enterprise.py | 2 | ||||
-rw-r--r-- | buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml | 11 | ||||
-rw-r--r-- | etc/evergreen.yml | 44 | ||||
-rw-r--r-- | etc/generate_subtasks_config.yml | 1 | ||||
-rw-r--r-- | etc/repo_config.yaml | 26 |
5 files changed, 1 insertions, 83 deletions
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index cd747c99218..73e8b37ebd4 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -139,7 +139,7 @@ class EnterpriseDistro(packager.Distro): return [] if arch == "arm64": if self.dname == 'ubuntu': - return ["ubuntu1604", "ubuntu1804", "ubuntu2004"] + return ["ubuntu1804", "ubuntu2004"] if arch == "aarch64": if self.dname == 'redhat': return ["rhel82"] diff --git a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml index a4466a44d7e..9b6f628db60 100644 --- a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml +++ b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml @@ -11,17 +11,6 @@ evergreen_projects: evergreen_buildvariants: - - name: enterprise-ubuntu1604-arm64 - edition: enterprise - platform: ubuntu1604 - architecture: aarch64 - - - name: enterprise-ubuntu1604-arm64 - edition: enterprise - platform: ubuntu1604 - architecture: arm64 - versions: ["3.4", "3.6", "4.0"] - - name: ubuntu1804 edition: targeted platform: ubuntu1804 diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 84712703197..e6fbc7ed5d2 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -319,7 +319,6 @@ variables: - enterprise-suse12-64 - enterprise-suse15-64 - enterprise-suse12-s390x - - enterprise-ubuntu1604-arm64 - enterprise-ubuntu1804-64 - enterprise-ubuntu1804-arm64 - enterprise-ubuntu2004-arm64 @@ -388,7 +387,6 @@ variables: - suse15 - enterprise-suse15-64 - ubuntu1804-debug-suggested - - enterprise-ubuntu1604-arm64 - enterprise-ubuntu-dynamic-1804-clang-tidy-required - ubuntu1804 - ubuntu1804-arm64 @@ -8858,48 +8856,6 @@ buildvariants: tasks: - name: tla_plus -- name: enterprise-ubuntu1604-arm64 - display_name: Enterprise Ubuntu 16.04 arm64 - modules: - - enterprise - run_on: - - ubuntu1604-arm64-large - expansions: - additional_package_targets: archive-mongocryptd archive-mongocryptd-debug - push_path: linux - push_bucket: downloads.10gen.com - push_name: linux - push_arch: aarch64-enterprise-ubuntu1604 - compile_flags: --ssl MONGO_DISTMOD=ubuntu1604 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers - has_packages: true - packager_script: packager_enterprise.py - packager_arch: arm64 - packager_distro: ubuntu1604 - repo_edition: enterprise - multiversion_platform: ubuntu1604 - multiversion_architecture: arm64 - multiversion_architecture_42_or_later: aarch64 - multiversion_edition: enterprise - scons_cache_scope: shared - tasks: - - name: compile_test_and_package_serial_TG - - name: aggregation - - name: .auth !.audit !.multiversion !.jscore - - name: .misc_js - - name: fle - - name: .jscore .common !.auth - - name: .jstestfuzz .common - - name: replica_sets - - name: .replica_sets .common - - name: .sharding .txns - - name: sharding_gen - - name: .ssl - - name: .stitch - - name: .publish - distros: - - ubuntu1604-test - - name: enterprise-ubuntu1804-arm64 display_name: Enterprise Ubuntu 18.04 arm64 modules: diff --git a/etc/generate_subtasks_config.yml b/etc/generate_subtasks_config.yml index 13312b06f73..725cb3c9d5c 100644 --- a/etc/generate_subtasks_config.yml +++ b/etc/generate_subtasks_config.yml @@ -23,7 +23,6 @@ build_variant_large_distro_exceptions: - enterprise-suse12-64 - enterprise-suse12-s390x - enterprise-suse15-64 - - enterprise-ubuntu1604-arm64 - enterprise-ubuntu1804-arm64 - enterprise-ubuntu1804-ppc64le - enterprise-ubuntu1804-s390x diff --git a/etc/repo_config.yaml b/etc/repo_config.yaml index 681ac9f4dd7..6eb5833c52d 100644 --- a/etc/repo_config.yaml +++ b/etc/repo_config.yaml @@ -203,18 +203,6 @@ repos: repos: - apt/ubuntu/dists/trusty/mongodb-org - - name: ubuntu1604 - type: deb - code_name: "xenial" - edition: org - bucket: repo.mongodb.org - component: multiverse - architectures: - - arm64 - - i386 - repos: - - apt/ubuntu/dists/xenial/mongodb-org - - name: ubuntu1804 type: deb code_name: "bionic" @@ -425,20 +413,6 @@ repos: repos: - apt/ubuntu/dists/trusty/mongodb-enterprise - - name: ubuntu1604 - type: deb - code_name: "xenial" - edition: enterprise - bucket: repo.mongodb.com - component: multiverse - architectures: - - ppc64el - - s390x - - arm64 - - i386 - repos: - - apt/ubuntu/dists/xenial/mongodb-enterprise - - name: ubuntu1804 type: deb code_name: "bionic" |