Import wiredtiger: 8a432f1e385a044307d7c31bb5287878c12585dc from branch mongodb-5.2

ref: efd9d9adf2..8a432f1e38
for: 5.2.0-rc4

WT-8501       Create functions to refactor endianness tasks in evergreen.yml

2 files changed, 56 insertions, 72 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 95a8ff833d6..020d08c12ed 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-5.2",
-    "commit": "efd9d9adf2af4d68383868c4bd5e156b19bca99b"
+    "commit": "8a432f1e385a044307d7c31bb5287878c12585dc"
 }
diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml
index 84f398c6a99..ef3b617498b 100755
--- a/src/third_party/wiredtiger/test/evergreen.yml
+++ b/src/third_party/wiredtiger/test/evergreen.yml
@@ -38,30 +38,14 @@ functions:
       remote_file: wiredtiger/${build_variant}/${revision}/artifacts/${dependent_task|compile}_${build_id}.tgz
       bucket: build_external
       extract_to: ${destination|wiredtiger}
-  "fetch artifacts from little-endian" :
+  "fetch endian format artifacts" :
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        remote_file: wiredtiger/little-endian/${revision}/artifacts/WT_TEST.tgz
+        remote_file: wiredtiger/${endian_format}/${revision}/artifacts/${remote_file}.tgz
         bucket: build_external
-        local_file: WT_TEST-little-endian.tgz
-    - command: archive.targz_extract
-      params:
-        path: "WT_TEST-little-endian.tgz"
-        destination: "wiredtiger/build_posix/test/format"
-  "fetch artifacts from big-endian" :
-    - command: s3.get
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        remote_file: wiredtiger/big-endian/${revision}/artifacts/WT_TEST.tgz
-        bucket: build_external
-        local_file: WT_TEST-big-endian.tgz
-    - command: archive.targz_extract
-      params:
-        path: "WT_TEST-big-endian.tgz"
-        destination: "wiredtiger/build_posix/test/format"
+        extract_to: wiredtiger/build_posix/test/format
   "fetch mongo-tests repo" :
     command: shell.exec
     params:
@@ -481,6 +465,17 @@ functions:
         content_type: application/tar
         display_name: Artifacts
         remote_file: wiredtiger/${build_variant}/${revision}/artifacts/${task_name}_${build_id}${postfix|}.tgz
+  "upload endian format artifacts":
+    - command: s3.put
+      params:
+        aws_secret: ${aws_secret}
+        aws_key: ${aws_key}
+        local_file: ${local_file}
+        bucket: build_external
+        permissions: public-read
+        content_type: application/tar
+        display_name: WT_TEST
+        remote_file: wiredtiger/${endian_format}/${revision}/artifacts/${remote_file}
   "cleanup":
     command: shell.exec
     params:
@@ -633,6 +628,15 @@ functions:
           source venv/bin/activate
           ${python_binary} ../../../bench/perf_run_py/validate_expected_stats.py '${stat_file}' ${comparison_op} '${expected-stats}'
 
+  "verify wt datafiles":
+    - command: shell.exec
+      params:
+        working_dir: "wiredtiger"
+        script: |
+          set -o errexit
+          set -o verbose
+          ./test/evergreen/verify_wt_datafiles.sh 2>&1
+
 #######################################
 #               Variables             #
 #######################################
@@ -2065,18 +2069,14 @@ tasks:
           script: |
             set -o errexit
             set -o verbose
-            # Archive the WT_TEST directories which include the generated wt data files
+            # Archive the WT_TEST directories which include the generated wt data files. We cannot
+            # use the Evergreen archive command as we need to archive multiple WT_TEST folders.
             tar -zcvf WT_TEST.tgz WT_TEST*
-      - command: s3.put
-        params:
-          aws_secret: ${aws_secret}
-          aws_key: ${aws_key}
+      - func: "upload endian format artifacts"
+        vars:
+          endian_format: little-endian
           local_file: wiredtiger/build_posix/test/format/WT_TEST.tgz
-          bucket: build_external
-          permissions: public-read
-          content_type: application/tar
-          display_name: WT_TEST
-          remote_file: wiredtiger/little-endian/${revision}/artifacts/WT_TEST.tgz
+          remote_file: WT_TEST-little-endian.tgz
 
   - name: verify-datafile-little-endian
     depends_on:
@@ -2084,14 +2084,11 @@ tasks:
     - name: generate-datafile-little-endian
     commands:
       - func: "fetch artifacts"
-      - func: "fetch artifacts from little-endian"
-      - command: shell.exec
-        params:
-          working_dir: "wiredtiger"
-          script: |
-            set -o errexit
-            set -o verbose
-            ./test/evergreen/verify_wt_datafiles.sh 2>&1
+      - func: "fetch endian format artifacts"
+        vars:
+          endian_format: little-endian
+          remote_file: WT_TEST-little-endian
+      - func: "verify wt datafiles"
 
   - name: verify-datafile-from-little-endian
     depends_on:
@@ -2100,14 +2097,11 @@ tasks:
       variant: little-endian
     commands:
       - func: "fetch artifacts"
-      - func: "fetch artifacts from little-endian"
-      - command: shell.exec
-        params:
-          working_dir: "wiredtiger"
-          script: |
-            set -o errexit
-            set -o verbose
-            ./test/evergreen/verify_wt_datafiles.sh 2>&1
+      - func: "fetch endian format artifacts"
+        vars:
+          endian_format: little-endian
+          remote_file: WT_TEST-little-endian
+      - func: "verify wt datafiles"
 
   - name: generate-datafile-big-endian
     depends_on:
@@ -2127,18 +2121,14 @@ tasks:
           script: |
             set -o errexit
             set -o verbose
-            # Archive the WT_TEST directories which include the generated wt data files
+            # Archive the WT_TEST directories which include the generated wt data files. We cannot
+            # use the Evergreen archive command as we need to archive multiple WT_TEST folders.
             tar -zcvf WT_TEST.tgz WT_TEST*
-      - command: s3.put
-        params:
-          aws_secret: ${aws_secret}
-          aws_key: ${aws_key}
+      - func: "upload endian format artifacts"
+        vars:
+          endian_format: big-endian
           local_file: wiredtiger/build_posix/test/format/WT_TEST.tgz
-          bucket: build_external
-          permissions: public-read
-          content_type: application/tar
-          display_name: WT_TEST
-          remote_file: wiredtiger/big-endian/${revision}/artifacts/WT_TEST.tgz
+          remote_file: WT_TEST-big-endian.tgz
 
   - name: verify-datafile-big-endian
     depends_on:
@@ -2146,14 +2136,11 @@ tasks:
     - name: generate-datafile-big-endian
     commands:
       - func: "fetch artifacts"
-      - func: "fetch artifacts from big-endian"
-      - command: shell.exec
-        params:
-          working_dir: "wiredtiger"
-          script: |
-            set -o errexit
-            set -o verbose
-            ./test/evergreen/verify_wt_datafiles.sh 2>&1
+      - func: "fetch endian format artifacts"
+        vars:
+          endian_format: big-endian
+          remote_file: WT_TEST-big-endian
+      - func: "verify wt datafiles"
 
   - name: verify-datafile-from-big-endian
     depends_on:
@@ -2162,14 +2149,11 @@ tasks:
       variant: big-endian
     commands:
       - func: "fetch artifacts"
-      - func: "fetch artifacts from big-endian"
-      - command: shell.exec
-        params:
-          working_dir: "wiredtiger"
-          script: |
-            set -o errexit
-            set -o verbose
-            ./test/evergreen/verify_wt_datafiles.sh 2>&1
+      - func: "fetch endian format artifacts"
+        vars:
+          endian_format: big-endian
+          remote_file: WT_TEST-big-endian
+      - func: "verify wt datafiles"
 
   - name: clang-analyzer
     tags: ["pull_request"]