From 0258bab009ae2eda406deedca41f0cbb2d6c6321 Mon Sep 17 00:00:00 2001 From: "siddhartha.mahajan" Date: Fri, 24 Jun 2022 05:29:08 +0000 Subject: Import wiredtiger: 1696bc595ca30ebeb0c2ecd5170c60b2367c83d2 from branch mongodb-master ref: f8635d2114..1696bc595c for: 6.1.0-rc0 WT-9479 Fixing cppsuite archiving stage in evergreen (#8047) --- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/test/evergreen.yml | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index e985432246c..43f465fec79 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-master", - "commit": "f8635d2114e04b0eb12b1884c1f6d76013a3e3fc" + "commit": "1696bc595ca30ebeb0c2ecd5170c60b2367c83d2" } diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index bc2011a7604..a58e73d2715 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -370,10 +370,20 @@ functions: - command: perf.send params: file: ./wiredtiger/cmake_build/test/cppsuite/${test_name}.json + # Delete unnecessary data from the upload. + - command: shell.exec + params: + script: | + rm -rf wiredtiger/cmake_build/examples + rm -rf wiredtiger/cmake_build/bench + mv wiredtiger/cmake_build/test/cppsuite wiredtiger/cmake_build/ + rm -rf wiredtiger/cmake_build/test/ + mkdir wiredtiger/cmake_build/test/ + mv wiredtiger/cmake_build/cppsuite wiredtiger/cmake_build/test/cppsuite - command: archive.targz_pack params: target: archive.tgz - source_dir: wiredtiger/cmake_build/test/cppsuite + source_dir: wiredtiger/cmake_build/ include: - "./**" - command: s3.put -- cgit v1.2.1