summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorAdam Rayner <adam.rayner@gmail.com>2022-06-20 20:06:35 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-06-20 20:38:07 +0000
commit451d1b53f1993bef6293de321d807f99778a848d (patch)
tree98e0a807dcb6aa77e1745217d30328a33c8e2046 /buildscripts
parent77ee09ff95f6f51483ed1cde01198879adaa71ad (diff)
downloadmongo-451d1b53f1993bef6293de321d807f99778a848d.tar.gz
SERVER-65733: remove SNMP module
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/antithesis/base_images/mongo_binaries/Dockerfile2
-rw-r--r--buildscripts/antithesis/base_images/workload/Dockerfile2
-rwxr-xr-xbuildscripts/packager_enterprise.py6
-rw-r--r--buildscripts/packaging/msi/mongod.yaml2
-rw-r--r--buildscripts/resmokeconfig/suites/snmp.yml11
5 files changed, 5 insertions, 18 deletions
diff --git a/buildscripts/antithesis/base_images/mongo_binaries/Dockerfile b/buildscripts/antithesis/base_images/mongo_binaries/Dockerfile
index 5390f8b9ddb..ad0709286ed 100644
--- a/buildscripts/antithesis/base_images/mongo_binaries/Dockerfile
+++ b/buildscripts/antithesis/base_images/mongo_binaries/Dockerfile
@@ -12,7 +12,7 @@ RUN mkdir -p /scripts
# Install dependencies of MongoDB Server
RUN apt-get update
-RUN apt-get install -qy libcurl4 libgssapi-krb5-2 libldap-2.4-2 libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit snmp openssl liblzma5 python3
+RUN apt-get install -qy libcurl4 libgssapi-krb5-2 libldap-2.4-2 libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit openssl liblzma5 python3
# -------------------
# Everything above this line should be common image setup
diff --git a/buildscripts/antithesis/base_images/workload/Dockerfile b/buildscripts/antithesis/base_images/workload/Dockerfile
index 01017d51c61..b8d46508252 100644
--- a/buildscripts/antithesis/base_images/workload/Dockerfile
+++ b/buildscripts/antithesis/base_images/workload/Dockerfile
@@ -14,7 +14,7 @@ RUN debconf-set-selections /tmp/preseed.txt
RUN rm /tmp/preseed.txt
RUN apt-get update
-RUN apt-get install -qy libcurl4 libgssapi-krb5-2 libldap-2.4-2 libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit snmp openssl liblzma5 libssl-dev build-essential software-properties-common
+RUN apt-get install -qy libcurl4 libgssapi-krb5-2 libldap-2.4-2 libwrap0 libsasl2-2 libsasl2-modules libsasl2-modules-gssapi-mit openssl liblzma5 libssl-dev build-essential software-properties-common
RUN add-apt-repository ppa:deadsnakes/ppa
RUN apt-get update
diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py
index fcc260c86be..b8f042f6cf9 100755
--- a/buildscripts/packager_enterprise.py
+++ b/buildscripts/packager_enterprise.py
@@ -24,7 +24,7 @@
# * Before you run the program on a new host, these are the
# prerequisites:
#
-# apt-get install dpkg-dev rpm debhelper fakeroot ia32-libs createrepo git-core libsnmp15
+# apt-get install dpkg-dev rpm debhelper fakeroot ia32-libs createrepo git-core
# echo "Now put the dist gnupg signing keys in ~root/.gnupg"
import errno
@@ -228,7 +228,7 @@ def unpack_binaries_into(build_os, arch, spec, where):
try:
packager.sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)])
release_dir = glob('mongodb-linux-*')[0]
- for releasefile in "bin", "snmp", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2":
+ for releasefile in "bin", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2":
os.rename("%s/%s" % (release_dir, releasefile), releasefile)
os.rmdir(release_dir)
except Exception:
@@ -257,7 +257,7 @@ def make_package(distro, build_os, arch, spec, srcdir):
"(cd \"%s\" && git archive %s %s/ ) | (cd \"%s\" && tar xvf -)" %
(srcdir, spec.metadata_gitspec(), pkgdir, sdir)
])
- # Splat the binaries and snmp files under sdir. The "build" stages of the
+ # Splat the binaries under sdir. The "build" stages of the
# packaging infrastructure will move the files to wherever they
# need to go.
unpack_binaries_into(build_os, arch, spec, sdir)
diff --git a/buildscripts/packaging/msi/mongod.yaml b/buildscripts/packaging/msi/mongod.yaml
index ba10e7517ef..dd4bdb39011 100644
--- a/buildscripts/packaging/msi/mongod.yaml
+++ b/buildscripts/packaging/msi/mongod.yaml
@@ -36,5 +36,3 @@ net:
## Enterprise-Only Options:
#auditLog:
-
-#snmp:
diff --git a/buildscripts/resmokeconfig/suites/snmp.yml b/buildscripts/resmokeconfig/suites/snmp.yml
deleted file mode 100644
index a462da0b7af..00000000000
--- a/buildscripts/resmokeconfig/suites/snmp.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-test_kind: js_test
-
-selector:
- roots:
- - src/mongo/db/modules/*/jstests/snmp/*.js
-
-# snmp tests start their own mongod's.
-executor:
- config:
- shell_options:
- nodb: ''