summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXueruiFa <xuerui.fa@mongodb.com>2022-06-22 22:22:33 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-06-22 23:56:04 +0000
commit16ab18a1b9a4351d7ea9b1437607652abb13d722 (patch)
tree10c359b950adefb7fc1526473eac398428d7b3c2
parent9f574108413c26650d5b4201321dbea1798a90ce (diff)
downloadmongo-16ab18a1b9a4351d7ea9b1437607652abb13d722.tar.gz
Revert "SERVER-65943 Add logging to multiversionconstants.py"
This reverts commit b618f09f9bf4f285266232ba4eb70d84c97355f9.
-rw-r--r--buildscripts/resmokelib/multiversionconstants.py12
-rw-r--r--evergreen/get_bin_and_fcv_versions.sh2
2 files changed, 1 insertions, 13 deletions
diff --git a/buildscripts/resmokelib/multiversionconstants.py b/buildscripts/resmokelib/multiversionconstants.py
index b1ea7a599e3..56381531f72 100644
--- a/buildscripts/resmokelib/multiversionconstants.py
+++ b/buildscripts/resmokelib/multiversionconstants.py
@@ -3,8 +3,6 @@ import os
import shutil
from subprocess import DEVNULL, STDOUT, CalledProcessError, call, check_output
-import logging
-import sys
import structlog
from buildscripts.resmokelib.multiversion.multiversion_service import (
@@ -16,11 +14,6 @@ LAST_LTS = "last_lts"
LAST_CONTINUOUS = "last_continuous"
LOGGER = structlog.getLogger(__name__)
-logging.basicConfig(
- format="[%(asctime)s - %(name)s - %(levelname)s] %(message)s",
- level=logging.INFO,
- stream=sys.stderr,
-)
def generate_mongo_version_file():
@@ -92,11 +85,8 @@ LAST_LTS_BIN_VERSION = version_constants.get_last_lts_fcv()
LAST_CONTINUOUS_BIN_VERSION = version_constants.get_last_continuous_fcv()
LAST_LTS_FCV = version_constants.get_last_lts_fcv()
-LOGGER.info("Last LTS FCV: {}".format(LAST_LTS_FCV))
LAST_CONTINUOUS_FCV = version_constants.get_last_continuous_fcv()
-LOGGER.info("Last Continuous FCV: {}".format(LAST_CONTINUOUS_FCV))
LATEST_FCV = version_constants.get_latest_fcv()
-LOGGER.info("Latest FCV: {}".format(LATEST_FCV))
LAST_CONTINUOUS_MONGO_BINARY = version_constants.build_last_continuous_binary("mongo")
LAST_CONTINUOUS_MONGOD_BINARY = version_constants.build_last_continuous_binary("mongod")
@@ -107,12 +97,10 @@ LAST_LTS_MONGOD_BINARY = version_constants.build_last_lts_binary("mongod")
LAST_LTS_MONGOS_BINARY = version_constants.build_last_lts_binary("mongos")
REQUIRES_FCV_TAG_LATEST = version_constants.get_latest_tag()
-LOGGER.info("Requires FCV Tag Latest: {}".format(REQUIRES_FCV_TAG_LATEST))
# Generate tags for all FCVS in (lastLTS, latest], or (lowerBoundOverride, latest] if requested.
# All multiversion tests should be run with these tags excluded.
REQUIRES_FCV_TAG = version_constants.get_fcv_tag_list()
-LOGGER.info("Requires FCV Tag: {}".format(REQUIRES_FCV_TAG))
# Generate evergreen project names for all FCVs less than latest.
EVERGREEN_PROJECTS = ['mongodb-mongo-master']
diff --git a/evergreen/get_bin_and_fcv_versions.sh b/evergreen/get_bin_and_fcv_versions.sh
index 0843bf9da3b..0bc91fe4baa 100644
--- a/evergreen/get_bin_and_fcv_versions.sh
+++ b/evergreen/get_bin_and_fcv_versions.sh
@@ -4,6 +4,6 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)"
cd src
set -o errexit
-set -o verbose
+
activate_venv
python buildscripts/resmoke.py generate-fcv-constants