зеркало из https://github.com/mozilla/gecko-dev.git
No bug: [release] Fix path to update-verify diff-summary log; r=bhearsum
when update-verify migrated from using build-tools to in-tree, the path to `diff-summary.log` was not updated. Differential Revision: https://phabricator.services.mozilla.com/D32403 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
04339696c5
Коммит
dd553f4200
|
@ -24,7 +24,7 @@ job-defaults:
|
||||||
worker:
|
worker:
|
||||||
artifacts:
|
artifacts:
|
||||||
- name: 'public/build/diff-summary.log'
|
- name: 'public/build/diff-summary.log'
|
||||||
path: '/builds/worker/tools/release/updates/diff-summary.log'
|
path: '/builds/worker/checkouts/gecko/diff-summary.log'
|
||||||
type: file
|
type: file
|
||||||
docker-image:
|
docker-image:
|
||||||
in-tree: "update-verify"
|
in-tree: "update-verify"
|
||||||
|
|
|
@ -18,7 +18,7 @@ to_build_id=""
|
||||||
to_app_version=""
|
to_app_version=""
|
||||||
to_display_version=""
|
to_display_version=""
|
||||||
override_certs=""
|
override_certs=""
|
||||||
diff_summary_log="$PWD/diff-summary.log"
|
diff_summary_log=${DIFF_SUMMARY_LOG:-"$PWD/diff-summary.log"}
|
||||||
if [ -e ${diff_summary_log} ]; then
|
if [ -e ${diff_summary_log} ]; then
|
||||||
rm ${diff_summary_log}
|
rm ${diff_summary_log}
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -33,6 +33,7 @@ if __name__ == "__main__":
|
||||||
parser.add_argument("--verify-channel", required=True, dest="verify_channel")
|
parser.add_argument("--verify-channel", required=True, dest="verify_channel")
|
||||||
parser.add_argument("--chunks", required=True, dest="chunks", type=int)
|
parser.add_argument("--chunks", required=True, dest="chunks", type=int)
|
||||||
parser.add_argument("--this-chunk", required=True, dest="thisChunk", type=int)
|
parser.add_argument("--this-chunk", required=True, dest="thisChunk", type=int)
|
||||||
|
parser.add_argument("--diff-summary", required=True, type=str)
|
||||||
|
|
||||||
options = parser.parse_args()
|
options = parser.parse_args()
|
||||||
assert options.chunks and options.thisChunk, \
|
assert options.chunks and options.thisChunk, \
|
||||||
|
@ -53,7 +54,11 @@ if __name__ == "__main__":
|
||||||
myVerifyConfig.write(fh)
|
myVerifyConfig.write(fh)
|
||||||
fh.close()
|
fh.close()
|
||||||
run_cmd(["cat", configFile])
|
run_cmd(["cat", configFile])
|
||||||
run_cmd(UPDATE_VERIFY_COMMAND + [configFile], cwd=UPDATE_VERIFY_DIR)
|
run_cmd(
|
||||||
|
UPDATE_VERIFY_COMMAND + [configFile],
|
||||||
|
cwd=UPDATE_VERIFY_DIR,
|
||||||
|
env={"DIFF_SUMMARY_LOG": path.abspath(options.diff_summary)},
|
||||||
|
)
|
||||||
finally:
|
finally:
|
||||||
if path.exists(configFile):
|
if path.exists(configFile):
|
||||||
os.unlink(configFile)
|
os.unlink(configFile)
|
||||||
|
|
|
@ -21,7 +21,7 @@ else
|
||||||
EXTRA_PARAMS=""
|
EXTRA_PARAMS=""
|
||||||
fi
|
fi
|
||||||
$PYTHON $MY_DIR/chunked-verify.py --chunks $chunks --this-chunk $thisChunk \
|
$PYTHON $MY_DIR/chunked-verify.py --chunks $chunks --this-chunk $thisChunk \
|
||||||
--verify-config $VERIFY_CONFIG $EXTRA_PARAMS \
|
--verify-config $VERIFY_CONFIG --diff-summary $PWD/diff-summary.log $EXTRA_PARAMS \
|
||||||
2>&1 | tee $SCRIPTS_DIR/../verify_log.txt
|
2>&1 | tee $SCRIPTS_DIR/../verify_log.txt
|
||||||
|
|
||||||
print_failed_msg()
|
print_failed_msg()
|
||||||
|
|
Загрузка…
Ссылка в новой задаче