Skip to content

Commit f739500

Browse files
authored
Merge pull request #806 from browserstack/revert-805-revert-803-HST_9999_fix_force_upload_to_ats
Revert "Revert "Chore: Fixing force upload failing on ATS""
2 parents ea90579 + d5c6337 commit f739500

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

bin/commands/runs.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,15 @@ module.exports = function run(args, rawArgs) {
263263

264264
let test_zip_size = utils.fetchZipSize(path.join(process.cwd(), config.fileName));
265265
let npm_zip_size = utils.fetchZipSize(path.join(process.cwd(), config.packageFileName));
266-
let node_modules_size = await utils.fetchFolderSize(path.join(process.cwd(), "node_modules"))
266+
let node_modules_size = await utils.fetchFolderSize(path.join(process.cwd(), "node_modules"));
267+
268+
if (Constants.turboScaleObj.enabled) {
269+
// Note: Calculating md5 here for turboscale force-upload so that we don't need to re-calculate at hub
270+
let zip_md5sum = await checkUploaded.checkSpecsMd5(bsConfig.run_settings, args, {markBlockStart, markBlockEnd});
271+
let npm_package_md5sum = await checkUploaded.checkPackageMd5(bsConfig.run_settings);
272+
Object.assign(md5data, { npm_package_md5sum });
273+
Object.assign(md5data, { zip_md5sum });
274+
}
267275

268276
//Package diff
269277
let isPackageDiff = false;

bin/helpers/checkUploaded.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ const crypto = require('crypto'),
1313

1414
const checkSpecsMd5 = (runSettings, args, instrumentBlocks) => {
1515
return new Promise(function (resolve, reject) {
16-
if (args["force-upload"]) {
17-
return resolve("force-upload");
18-
}
1916
let cypressFolderPath = undefined;
2017
if (runSettings.home_directory) {
2118
cypressFolderPath = runSettings.home_directory;
@@ -166,4 +163,8 @@ const checkUploadedMd5 = (bsConfig, args, instrumentBlocks) => {
166163
});
167164
};
168165

169-
exports.checkUploadedMd5 = checkUploadedMd5;
166+
module.exports = {
167+
checkSpecsMd5,
168+
checkPackageMd5,
169+
checkUploadedMd5
170+
};

0 commit comments

Comments
 (0)