summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2020-08-03 14:54:20 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-08-03 05:07:52 +0000
commitff52b7a30a20d21b9468efdf39131a0e90e239b8 (patch)
tree44a73071ed6d79928e1691500e00381b7b6471d5
parent336af77ebb7242869dc8f742ca4c21b3941dad93 (diff)
downloadmongo-ff52b7a30a20d21b9468efdf39131a0e90e239b8.tar.gz
Import wiredtiger: 91b5d984b963379e2a9bb0cf0b048d3720202a1c from branch mongodb-4.6
ref: 77ae7e8b1b..91b5d984b9 for: 4.5.1 WT-6543 Distinguish Evergreen artifacts links across restarts for testing tasks
-rw-r--r--src/third_party/wiredtiger/import.data2
-rwxr-xr-xsrc/third_party/wiredtiger/test/evergreen.yml24
2 files changed, 23 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 08dcd0d9263..62f713290ac 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-4.6",
- "commit": "77ae7e8b1bcee00c8cfeba25deaf7a79e5d86675"
+ "commit": "91b5d984b963379e2a9bb0cf0b048d3720202a1c"
}
diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml
index cce2e440391..68ac9001277 100755
--- a/src/third_party/wiredtiger/test/evergreen.yml
+++ b/src/third_party/wiredtiger/test/evergreen.yml
@@ -262,7 +262,7 @@ functions:
permissions: public-read
content_type: application/tar
display_name: Artifacts
- remote_file: wiredtiger/${build_variant}/${revision}/artifacts/${task_name}_${build_id}.tgz
+ remote_file: wiredtiger/${build_variant}/${revision}/artifacts/${task_name}_${build_id}${postfix|}.tgz
"cleanup":
command: shell.exec
params:
@@ -394,6 +394,8 @@ pre:
- func: "cleanup"
post:
- func: "upload artifact"
+ vars:
+ postfix: -${execution}
- func: "cleanup"
tasks:
@@ -403,6 +405,8 @@ tasks:
commands:
- func: "get project"
- func: "compile wiredtiger"
+ - func: "upload artifact"
+ - func: "cleanup"
- name: compile-asan
tags: ["pull_request"]
@@ -412,6 +416,8 @@ tasks:
vars:
configure_env_vars: CC=/opt/mongodbtoolchain/v3/bin/clang CXX=/opt/mongodbtoolchain/v3/bin/clang++ PATH=/opt/mongodbtoolchain/v3/bin:$PATH CFLAGS="-fsanitize=address -fno-omit-frame-pointer -ggdb"
posix_configure_flags: --enable-silent-rules --enable-strict --enable-diagnostic --disable-static
+ - func: "upload artifact"
+ - func: "cleanup"
- name: compile-msan
commands:
@@ -420,6 +426,8 @@ tasks:
vars:
configure_env_vars: CC=/opt/mongodbtoolchain/v3/bin/clang CXX=/opt/mongodbtoolchain/v3/bin/clang++ PATH=/opt/mongodbtoolchain/v3/bin:$PATH CFLAGS="-fsanitize=memory -ggdb"
posix_configure_flags: --enable-silent-rules --enable-strict --enable-diagnostic --disable-static
+ - func: "upload artifact"
+ - func: "cleanup"
- name: compile-ubsan
commands:
@@ -428,6 +436,8 @@ tasks:
vars:
configure_env_vars: CC=/opt/mongodbtoolchain/v3/bin/gcc CXX=/opt/mongodbtoolchain/v3/bin/g++ PATH=/opt/mongodbtoolchain/v3/bin:$PATH CFLAGS="-fsanitize=undefined -ggdb"
posix_configure_flags: --enable-silent-rules --enable-strict --enable-diagnostic
+ - func: "upload artifact"
+ - func: "cleanup"
# production build with --disable-shared
- name: compile-production-disable-shared
@@ -437,6 +447,8 @@ tasks:
- func: "compile wiredtiger"
vars:
posix_configure_flags: --enable-silent-rules --enable-strict --disable-shared
+ - func: "upload artifact"
+ - func: "cleanup"
# production build with --disable-static
- name: compile-production-disable-static
@@ -446,6 +458,8 @@ tasks:
- func: "compile wiredtiger"
vars:
posix_configure_flags: --enable-silent-rules --enable-strict --disable-static --enable-lz4 --enable-snappy --enable-zlib --enable-zstd --enable-python
+ - func: "upload artifact"
+ - func: "cleanup"
- name: compile-linux-no-ftruncate
commands:
@@ -453,6 +467,8 @@ tasks:
- func: "compile wiredtiger no linux ftruncate"
vars:
posix_configure_flags: --enable-silent-rules --enable-diagnostic --enable-strict --enable-python
+ - func: "upload artifact"
+ - func: "cleanup"
- name: compile-wtperf
commands:
@@ -460,6 +476,8 @@ tasks:
- func: "compile wiredtiger"
vars:
posix_configure_flags: --enable-strict --enable-diagnostic
+ - func: "upload artifact"
+ - func: "cleanup"
- name: compile-gcc
tags: ["pull_request", "pull_request_compilers"]
@@ -770,6 +788,8 @@ tasks:
- name: compile-ubsan
commands:
- func: "fetch artifacts"
+ vars:
+ dependent_task: compile-ubsan
- func: "compile wiredtiger"
vars:
configure_env_vars: CC=/opt/mongodbtoolchain/v3/bin/gcc CXX=/opt/mongodbtoolchain/v3/bin/g++ PATH=/opt/mongodbtoolchain/v3/bin:$PATH CFLAGS="-fsanitize=undefined -ggdb"
@@ -1930,7 +1950,7 @@ tasks:
permissions: public-read
content_type: text/html
display_name: Coverage report
- remote_file: wiredtiger/${build_variant}/${revision}/coverage_report/coverage_report_${build_id}.html
+ remote_file: wiredtiger/${build_variant}/${revision}/coverage_report/coverage_report_${build_id}-${execution}.html
- name: spinlock-gcc-test
commands: