diff options
author | Carl Raiden Worley <carl.worley@10gen.com> | 2020-04-09 13:21:42 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-10 14:21:37 +0000 |
commit | a205f76bd5cf72b92250a4610078a9107c5a2c7d (patch) | |
tree | f0e2966737a8f2f41154d04cc19226e3bb4a53d5 /etc | |
parent | 9d4284a8010e35a640306017de895be568be4855 (diff) | |
download | mongo-a205f76bd5cf72b92250a4610078a9107c5a2c7d.tar.gz |
SERVER-46610 Remove wt develop from system-perf.yml and evergreen.yml
Diffstat (limited to 'etc')
-rw-r--r-- | etc/evergreen.yml | 45 | ||||
-rwxr-xr-x | etc/system_perf.yml | 129 |
2 files changed, 0 insertions, 174 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index aca12873dc6..12bf70de302 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -253,7 +253,6 @@ variables: - func: "get buildnumber" - func: "set up credentials" - func: "fetch and build OpenSSL" - - func: "use WiredTiger develop" # noop if ${use_wt_develop} is not "true" - func: "set up win mount script" - func: "generate compile expansions" teardown_group: @@ -377,7 +376,6 @@ variables: - enterprise-windows-inmem - enterprise-windows-nopush-template - enterprise-windows-required - - enterprise-windows-wtdevelop - ubuntu1804-debug-asan - ubuntu1804-debug-ubsan - ubuntu1804-debug-aubsan-lite @@ -499,7 +497,6 @@ functions: directory: ${git_project_directory|src} revisions: # for each module include revision as <module_name> : ${<module_name>_rev} enterprise: ${enterprise_rev} - wtdevelop: ${wtdevelop_rev} "fetch artifacts": &fetch_artifacts command: s3.get @@ -888,21 +885,6 @@ functions: bash buildscripts/fetch_and_build_openssl.sh "${python|python3}" "${openssl_make_flags|}" "${openssl_config_flags|}" fi - "use WiredTiger develop": - command: shell.exec - params: - working_dir: src - script: | - set -o errexit - set -o verbose - if [ "${use_wt_develop|}" = "true" ]; then - cd src/third_party - for wtdir in dist examples ext lang src test tools ; do - rm -rf wiredtiger/$wtdir - mv wtdevelop/$wtdir wiredtiger/ - done - fi - "shared scons cache pruning": command: shell.exec type: system @@ -4348,7 +4330,6 @@ tasks: - func: "upload pip requirements" - func: "get buildnumber" - func: "set up credentials" - - func: "use WiredTiger develop" # noop if ${use_wt_develop} is not "true" - func: "set up win mount script" - func: "generate compile expansions" # Then we load the generated version data into the agent so we can use it in task definitions @@ -8553,11 +8534,6 @@ modules: prefix: src/mongo/db/modules branch: v4.4 -- name: wtdevelop - repo: git@github.com:wiredtiger/wiredtiger.git - prefix: src/third_party - branch: develop - ####################################### # Buildvariants # ####################################### @@ -8643,17 +8619,6 @@ buildvariants: - name: .stitch - name: server_discovery_and_monitoring_json_test_TG -- <<: *linux-64-debug-template - name: linux-64-debug-wtdevelop - display_name: "~ Linux DEBUG WiredTiger develop" - modules: - - wtdevelop - expansions: - use_wt_develop: true - resmoke_jobs_factor: 0.5 # Avoid starting too many mongod's - compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-free-mon=off --enable-http-client=off - test_flags: --excludeWithAnyTags=requires_http_client - - name: linux-64-duroff display_name: Linux (No Journal) run_on: @@ -9522,16 +9487,6 @@ buildvariants: - windows-64-vs2019-large - name: .benchmarks -- <<: *enterprise-windows-nopush-template - name: enterprise-windows-wtdevelop - display_name: "~ Enterprise Windows WiredTiger develop" - modules: - - enterprise - - wtdevelop - expansions: - <<: *enterprise-windows-nopush-expansions-template - use_wt_develop: true - - name: enterprise-windows-inmem display_name: Enterprise Windows (inMemory) modules: diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 072da36319f..37cd0afd7a6 100755 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -79,7 +79,6 @@ functions: linkbench: ${linkbench_rev} genny: ${genny_rev} workloads: ${workloads_rev} - wtdevelop: ${wtdevelop_rev} mongo-tools: ${mongo-tools_rev} "compile mongodb": @@ -110,12 +109,6 @@ functions: # We get the raw version string (r1.2.3-45-gabcdef) from git MONGO_VERSION=$(git describe --abbrev=7) - # If we're going to compile the upstream wtdevelop repository for wiredtiger, add - # that githash to version string. - if [ "${compile-variant|}" = "-wtdevelop" ]; then - WT_VERSION=$(cd src/third_party/wtdevelop; git describe --abbrev=7 | cut -c 9-) - MONGO_VERSION="$MONGO_VERSION-wtdevelop-$WT_VERSION" - fi # If this is a patch build, we add the patch version id to the version string so we know # this build was a patch, and which evergreen task it came from if [ "${is_patch|false}" = "true" ]; then @@ -192,21 +185,6 @@ functions: content_type: ${content_type|application/x-gzip} display_name: mongodb${compile-variant|}.tar.gz - "use WiredTiger develop": - command: shell.exec - params: - working_dir: src - script: | - set -o errexit - set -o verbose - if [ "${compile-variant|}" = "-wtdevelop" ]; then - cd src/third_party - for wtdir in dist examples ext lang src test tools ; do - rm -rf wiredtiger/$wtdir - mv wtdevelop/$wtdir wiredtiger/ - done - fi - "write yml config": &write_yml_config command: shell.exec params: @@ -426,7 +404,6 @@ tasks: commands: - command: manifest.load - func: "git get project" - - func: "use WiredTiger develop" # noop if ${compile-variant|} is not "-wtdevelop" - func: "compile mongodb" - name: linkbench @@ -910,11 +887,6 @@ modules: prefix: workloads branch: master -- name: wtdevelop - repo: git@github.com:wiredtiger/wiredtiger.git - prefix: src/third_party - branch: develop - - name: linkbench repo: git@github.com:10gen/linkbench.git prefix: linkbench @@ -963,20 +935,6 @@ buildvariants: - name: compile - name: genny_generate_all_tasks -- <<: *compile-amazon2 - name: wtdevelop-compile-amazon2 - display_name: WT Develop Compile - modules: - - mongo-tools - - wtdevelop - - enterprise - - genny # needed for genny_generate_all_tasks - expansions: - <<: *compile-expansions - compile-variant: -wtdevelop - tasks: - - name: compile - - name: compile-rhel70 display_name: Compile for Atlas-like modules: @@ -1534,90 +1492,3 @@ buildvariants: - name: linkbench - name: genny_patch_tasks - name: genny_auto_tasks - - -####################################### -# WT Develop Linux Buildvariants # -####################################### -- name: wtdevelop-1-node-replSet - display_name: WT Develop 1-Node ReplSet - batchtime: 10080 # 7 days - modules: *modules - expansions: - setup: single-replica - cluster: single - platform: linux - project_dir: *project_dir - compile-variant: -wtdevelop - authentication: enabled - storageEngine: wiredTiger - run_on: - - "rhel70-perf-single" - depends_on: - - name: compile - variant: wtdevelop-compile-amazon2 - - name: genny_generate_all_tasks - variant: compile-amazon2 - tasks: *1nodetasks - -- name: wtdevelop-standalone - display_name: WT Develop Standalone - batchtime: 10080 # 7 days - modules: *modules - expansions: - setup: standalone - cluster: single - platform: linux - project_dir: *project_dir - compile-variant: -wtdevelop - authentication: enabled - storageEngine: wiredTiger - run_on: - - "rhel70-perf-single" - depends_on: - - name: compile - variant: wtdevelop-compile-amazon2 - - name: genny_generate_all_tasks - variant: compile-amazon2 - tasks: *standalonetasks - -- name: wtdevelop-3-node-replSet - display_name: WT Develop 3-Node ReplSet - batchtime: 10080 # 7 days - modules: *modules - expansions: - setup: replica - cluster: replica - platform: linux - project_dir: *project_dir - compile-variant: -wtdevelop - authentication: enabled - storageEngine: wiredTiger - run_on: - - "rhel70-perf-replset" - depends_on: - - name: compile - variant: wtdevelop-compile-amazon2 - - name: genny_generate_all_tasks - variant: compile-amazon2 - tasks: *3nodetasks - -# Disabled: SERVER-35586 -#- name: wtdevelop-shard-lite -# display_name: WT Develop Shard Lite Cluster -# batchtime: 10080 # 7 days -# modules: *modules -# expansions: -# setup: shard-lite -# cluster: shard-lite -# platform: linux -# project_dir: *project_dir -# compile-variant: -wtdevelop -# authentication: enabled -# storageEngine: wiredTiger -# run_on: -# - "rhel70-perf-shard-lite" -# depends_on: -# - name: compile -# variant: wtdevelop-compile-amazon2 -# tasks: *shardlitetasks |