diff options
| author | trahman1318 <tausif.rahman@mongodb.com> | 2022-02-09 22:13:54 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-09 23:19:37 +0000 |
| commit | fdf2fc77653d05550f7f8a55e54f865ed008bbdc (patch) | |
| tree | 386c62ab4c3bed622d679d9651c3137f20bf18c9 | |
| parent | 672021fe35afc4f6a441880f7fa3b3ce53424795 (diff) | |
| download | mongo-fdf2fc77653d05550f7f8a55e54f865ed008bbdc.tar.gz | |
SERVER-62032 Complete TODO listed in SERVER-60619
| -rw-r--r-- | buildscripts/antithesis/topologies/sharded_cluster/Dockerfile | 1 | ||||
| -rw-r--r-- | etc/evergreen.yml | 10 | ||||
| -rw-r--r-- | evergreen/antithesis_image_build.sh | 13 |
3 files changed, 21 insertions, 3 deletions
diff --git a/buildscripts/antithesis/topologies/sharded_cluster/Dockerfile b/buildscripts/antithesis/topologies/sharded_cluster/Dockerfile index 45816d5ed30..e13fcbdf8a7 100644 --- a/buildscripts/antithesis/topologies/sharded_cluster/Dockerfile +++ b/buildscripts/antithesis/topologies/sharded_cluster/Dockerfile @@ -3,3 +3,4 @@ COPY docker-compose.yml / ADD scripts /scripts ADD logs /logs ADD data /data +ADD debug /debug diff --git a/etc/evergreen.yml b/etc/evergreen.yml index ecdd37db1db..48134bce698 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -7220,7 +7220,7 @@ tasks: # antithesis_image_tag build parameter to override this if required. patchable: false depends_on: - - name: archive_dist_test + - name: archive_dist_test_debug commands: - *f_expansions_write - func: "git get project no modules" @@ -7236,7 +7236,13 @@ tasks: local_file: antithesis_last_push.txt bucket: mciuploads - func: "do setup" - # TODO SERVER-60619 download debug symbols and put them where needed. + - command: s3.get + params: + aws_key: ${aws_key} + aws_secret: ${aws_secret} + remote_file: ${mongo_debugsymbols} + bucket: mciuploads + local_file: src/mongo-debugsymbols.tgz - command: subprocess.exec params: binary: bash diff --git a/evergreen/antithesis_image_build.sh b/evergreen/antithesis_image_build.sh index 69be66031ea..64de089d7bb 100644 --- a/evergreen/antithesis_image_build.sh +++ b/evergreen/antithesis_image_build.sh @@ -6,7 +6,7 @@ set -euo pipefail cd src commit_date=$(date -d "$(git log -1 -s --format=%ci)" "+%s") last_run_date=$(cat ../antithesis_last_push.txt || echo 0) -if [ "${is_patch}" != "true" && $last_run_date -gt $commit_date ]; then +if [ "${is_patch}" != "true" ] && [ "${last_run_date}" -gt "${commit_date}" ]; then echo -e "Refusing to push new antithesis images because this commit is older\nthan the last pushed commit" exit 0 fi @@ -25,6 +25,17 @@ mkdir -p antithesis/topologies/replica_set/{logs,data}/workload mkdir -p antithesis/topologies/sharded_cluster/{logs,data}/database{1,2,3,4,5,6} mkdir -p antithesis/topologies/sharded_cluster/{logs,data}/configsvr{1,2,3} mkdir -p antithesis/topologies/sharded_cluster/{logs,data}/{mongos,workload} + +# extract debug symbols into usr/bin and have directory structure mimic Docker container +mkdir -p antithesis/topologies/sharded_cluster/debug/usr/bin +tar -zxvf src/mongo-debugsymbols.tgz -C antithesis/topologies/sharded_cluster/debug +cp antithesis/topologies/sharded_cluster/debug/dist-test/bin/* antithesis/topologies/sharded_cluster/debug/usr/bin +rm -rf antithesis/topologies/sharded_cluster/debug/dist-test + +# recompress debug symbols +tar -czvf antithesis/topologies/sharded_cluster/debug/mongo-debugsymbols.tgz -C antithesis/topologies/sharded_cluster/debug/ usr +rm -rf antithesis/topologies/sharded_cluster/debug/usr + echo "${revision}" > antithesis/topologies/sharded_cluster/data/workload/mongo_version.txt # copy ... to the build context |