Skip to content

Revert "Revert "Chore: Fixing force upload failing on ATS"" #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Revert "Revert "Chore: Fixing force upload failing on ATS"" #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e55b623
Revert "Revert "Chore: Fixing force upload failing on ATS""
KrishnaSuravarapu Mar 21, 2024
d5c6337
Merge branch 'master' into revert-805-revert-803-HST_9999_fix_force_u…
pranavj1001 Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion bin/commands/runs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,15 @@ module.exports = function run(args, rawArgs) {

let test_zip_size = utils.fetchZipSize(path.join(process.cwd(), config.fileName));
let npm_zip_size = utils.fetchZipSize(path.join(process.cwd(), config.packageFileName));
let node_modules_size = await utils.fetchFolderSize(path.join(process.cwd(), "node_modules"))
let node_modules_size = await utils.fetchFolderSize(path.join(process.cwd(), "node_modules"));

if (Constants.turboScaleObj.enabled) {
// Note: Calculating md5 here for turboscale force-upload so that we don't need to re-calculate at hub
let zip_md5sum = await checkUploaded.checkSpecsMd5(bsConfig.run_settings, args, {markBlockStart, markBlockEnd});
let npm_package_md5sum = await checkUploaded.checkPackageMd5(bsConfig.run_settings);
Object.assign(md5data, { npm_package_md5sum });
Object.assign(md5data, { zip_md5sum });
}

//Package diff
let isPackageDiff = false;
Expand Down
9 changes: 5 additions & 4 deletions bin/helpers/checkUploaded.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ const crypto = require('crypto'),

const checkSpecsMd5 = (runSettings, args, instrumentBlocks) => {
return new Promise(function (resolve, reject) {
if (args["force-upload"]) {
return resolve("force-upload");
}
let cypressFolderPath = undefined;
if (runSettings.home_directory) {
cypressFolderPath = runSettings.home_directory;
Expand Down Expand Up @@ -166,4 +163,8 @@ const checkUploadedMd5 = (bsConfig, args, instrumentBlocks) => {
});
};

exports.checkUploadedMd5 = checkUploadedMd5;
module.exports = {
checkSpecsMd5,
checkPackageMd5,
checkUploadedMd5
};