diff --git a/common.yml b/common.yml index f897a5807..39510220d 100644 --- a/common.yml +++ b/common.yml @@ -2026,51 +2026,6 @@ buildvariants: # RHEL x86_64 Buildvariants # ####################################### - - name: rhel62 - display_name: RHEL 6.2 - expansions: - mongo_os: "rhel62" - run_on: - - rhel62-small - tasks: - - name: "dist" - - name: "sign" - run_on: rhel87-small - - name: "push" - run_on: rhel80-small - - # This build is specifically for Splunk - - name: rhel62-no-kerberos - display_name: "# RHEL 6.2 w/o Kerberos" - expansions: - <<: - [ - *mongod_ssl_startup_args, - *mongo_ssl_startup_args, - *mongod_tls_startup_args, - *mongo_tls_startup_args, - ] - mongo_os: "rhel62" - mongo_edition: "enterprise" - smoke_use_ssl: --use-ssl - resmoke_use_ssl: _ssl - smoke_use_tls: --use-tls - resmoke_use_tls: _tls - edition: enterprise - run_kinit: true - resmoke_args: --jobs 4 - run_on: - - rhel62-small - tasks: - - name: "unit" - - name: ".3.6" - - name: ".4.0" - - name: "dist" - - name: "sign" - run_on: rhel87-small - # We intentionally do not invoke the push task. We want to upload these - # binaries to S3, but we do not add them to the release feed or RPM repos. - - name: rhel70 display_name: RHEL 7.0 run_on: @@ -2497,10 +2452,6 @@ github_pr_aliases: # a relatively recent platform that supports a wide range of servers. - variant: "^rhel88$" task: "^(aws-auth|integration|kerberos|legacy|native-cert-ssl|qa-dump-restore|qa-tests)" - # Run a subset of integration tests against the 3.6 version of MongoDB - # Server on all variants where that is the most recent supported version. - - variant: "^rhel62-no-kerberos$" - task: "integration-3.6" # Run a subset of integration tests against the latest version of MongoDB # Server on all variants where that is the most recent supported version. - variant: "^(rhel88|windows)$" diff --git a/etc/repo-config.yml b/etc/repo-config.yml index f0cd19498..0ab282dd2 100644 --- a/etc/repo-config.yml +++ b/etc/repo-config.yml @@ -64,22 +64,6 @@ repos: # #################### - - name: rhel62 - type: rpm - edition: org - bucket: repo.mongodb.org - repos: - - yum/redhat/6/mongodb-org - - yum/redhat/6Server/mongodb-org - - - name: rhel67 - type: rpm - edition: org - bucket: repo.mongodb.org - repos: - - yum/redhat/6/mongodb-org - - yum/redhat/6Server/mongodb-org - - name: rhel70 type: rpm edition: org @@ -333,22 +317,6 @@ repos: # #################### - - name: rhel62 - type: rpm - edition: enterprise - bucket: repo.mongodb.com - repos: - - yum/redhat/6/mongodb-enterprise - - yum/redhat/6Server/mongodb-enterprise - - - name: rhel67 - type: rpm - edition: enterprise - bucket: repo.mongodb.com - repos: - - yum/redhat/6/mongodb-enterprise - - yum/redhat/6Server/mongodb-enterprise - - name: rhel70 type: rpm edition: enterprise diff --git a/release/platform/platform.go b/release/platform/platform.go index 2cfa31ccb..d26fc0098 100644 --- a/release/platform/platform.go +++ b/release/platform/platform.go @@ -437,30 +437,6 @@ var platforms = []Platform{ BuildTags: defaultBuildTags, ServerVariantName: "enterprise-macos", }, - // This is a special build that we upload to S3 but not to the release - // repos. - { - Name: "rhel62", - // This needs to match the name of the buildvariant in the Evergreen - // config. - VariantName: "rhel62-no-kerberos", - Arch: ArchX86_64, - OS: OSLinux, - Pkg: PkgRPM, - BuildTags: []string{"failpoints"}, - SkipForJSONFeed: true, - ServerVariantName: "enterprise-rhel-62-64-bit", - MaxLinuxServerVersion: &version.Version{Major: 7, Minor: 0, Patch: 0}, - }, - { - Name: "rhel62", - Arch: ArchX86_64, - OS: OSLinux, - Pkg: PkgRPM, - Repos: []Repo{RepoEnterprise, RepoOrg}, - BuildTags: defaultBuildTags, - MaxLinuxServerVersion: &version.Version{Major: 7, Minor: 0, Patch: 0}, - }, { Name: "rhel70", Arch: ArchX86_64,