SERVER-65904 enable consistency checking hooks in Antithesis

2 files changed, 27 insertions, 29 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index a4b1589bfc9..f22c1027993 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -3053,7 +3053,6 @@ buildvariants:
 
 - name: enterprise-ubuntu1804-64-libvoidstar
   display_name: ~ Enterprise Ubuntu 18.04 w/ libvoidstar
-  cron: "0 4 * * FRI" # Every week at 0400 UTC Friday. This has to be a Friday since we run Antithesis on Fridays.
   modules:
   - enterprise
   run_on:
@@ -3067,11 +3066,10 @@ buildvariants:
     multiversion_edition: enterprise
     repo_edition: enterprise
     large_distro_name: ubuntu1804-build
-    use_scons_cache: false
-    scons_cache_scope: "none"
+    scons_cache_scope: shared
   tasks:
   - name: compile_and_archive_dist_test_TG
-  - name: .antithesis
+  - name: antithesis_image_push
   - name: generate_buildid_to_debug_symbols_mapping
 
 - <<: *enterprise-windows-nopush-template
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml
index 2f0ebf2b2ce..f042cefd9c2 100644
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@@ -2072,6 +2072,26 @@ functions:
       content_type: text/plain
       display_name: Resmoke.py Invocation for Local Usage
 
+  "antithesis image build":
+  - command: subprocess.exec
+    params:
+      binary: bash
+      args:
+      - "./src/evergreen/antithesis_image_build.sh"
+
+  "antithesis image push":
+  - command: subprocess.exec
+    params:
+      binary: bash
+      args:
+      - "./src/evergreen/antithesis_image_push.sh"
+
+  "antithesis dry run":
+  - command: subprocess.exec
+    params:
+      binary: bash
+      args:
+      - "./src/evergreen/antithesis_dry_run.sh"
 
 # Pre task steps
 pre:
@@ -7332,16 +7352,16 @@ tasks:
       args:
       - "./src/evergreen/feature_flag_tags_check.sh"
 
-- name: antithesis_image_build
+- name: antithesis_image_push
   tags: ["antithesis"]
   # this is not patchable to avoid hitting the docker registry excessively.
   # When iterating on this task, feel free to make this patchable for
   # testing purposes. Your image changes will be pushed with the
   # evergreen-patch tag, so as to not clobber the waterfall. Use the
   # antithesis_image_tag build parameter to override this if required.
-  patchable: false
   depends_on:
   - name: archive_dist_test_debug
+  exec_timeout_secs: 7200
   commands:
   - *f_expansions_write
   - func: "git get project no modules"
@@ -7349,13 +7369,6 @@ tasks:
   - func: "kill processes"
   - func: "cleanup environment"
   - func: "set up venv"
-  - command: s3.get
-    params:
-      aws_key: ${aws_key}
-      aws_secret: ${aws_secret}
-      remote_file: ${project}/${build_variant}/antithesis_last_push.txt
-      local_file: antithesis_last_push.txt
-      bucket: mciuploads
   - func: "do setup"
   - command: s3.get
     params:
@@ -7364,22 +7377,9 @@ tasks:
       remote_file: ${mongo_debugsymbols}
       bucket: mciuploads
       local_file: src/mongo-debugsymbols.tgz
-  - command: subprocess.exec
-    params:
-      binary: bash
-      args:
-      - "./src/evergreen/antithesis_image_build.sh"
-  - command: s3.put
-    params:
-      optional: true
-      aws_key: ${aws_key}
-      aws_secret: ${aws_secret}
-      local_file: antithesis_next_push.txt
-      remote_file: ${project}/${build_variant}/antithesis_last_push.txt
-      bucket: mciuploads
-      permissions: private
-      content_type: text/plain
-      display_name: Last Push Date (seconds since epoch)
+  - func: "antithesis image build"
+  - func: "antithesis dry run"
+  - func: "antithesis image push"
 
 - name: generate_buildid_to_debug_symbols_mapping
   tags: ["symbolizer"]