You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by as...@apache.org on 2021/04/15 12:07:23 UTC
[airflow] 04/36: Removes unused CI feature of printing output on
error (#15190)
This is an automated email from the ASF dual-hosted git repository.
ash pushed a commit to branch v2-0-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 1c046423a9e507e861030f919344414facaff2b1
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Apr 4 22:20:11 2021 +0200
Removes unused CI feature of printing output on error (#15190)
Fixes: #13924
(cherry picked from commit 7c17bf0d1e828b454a6b2c7245ded275b313c792)
---
scripts/in_container/_in_container_utils.sh | 30 +++--------------------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/scripts/in_container/_in_container_utils.sh b/scripts/in_container/_in_container_utils.sh
index 7d80f00..ad3083e 100644
--- a/scripts/in_container/_in_container_utils.sh
+++ b/scripts/in_container/_in_container_utils.sh
@@ -54,16 +54,6 @@ function assert_in_container() {
}
function in_container_script_start() {
- OUTPUT_PRINTED_ONLY_ON_ERROR=$(mktemp)
- export OUTPUT_PRINTED_ONLY_ON_ERROR
- readonly OUTPUT_PRINTED_ONLY_ON_ERROR
-
- if [[ ${VERBOSE=} == "true" && ${GITHUB_ACTIONS=} != "true" ]]; then
- echo
- echo "Output is redirected to ${OUTPUT_PRINTED_ONLY_ON_ERROR} and will be printed on error only"
- echo
- fi
-
if [[ ${VERBOSE_COMMANDS:="false"} == "true" ]]; then
set -x
fi
@@ -74,23 +64,9 @@ function in_container_script_end() {
EXIT_CODE=$?
if [[ ${EXIT_CODE} != 0 ]]; then
if [[ "${PRINT_INFO_FROM_SCRIPTS="true"}" == "true" ]]; then
- if [[ -f "${OUTPUT_PRINTED_ONLY_ON_ERROR}" ]]; then
- echo "###########################################################################################"
- echo
- echo "${COLOR_BLUE} EXIT CODE: ${EXIT_CODE} in container (See above for error message). Below is the output of the last action! ${COLOR_RESET}"
- echo
- echo "${COLOR_BLUE}*** BEGINNING OF THE LAST COMMAND OUTPUT *** ${COLOR_RESET}"
- cat "${OUTPUT_PRINTED_ONLY_ON_ERROR}"
- echo "${COLOR_BLUE}*** END OF THE LAST COMMAND OUTPUT *** ${COLOR_RESET}"
- echo
- echo "${COLOR_BLUE} EXIT CODE: ${EXIT_CODE} in container. The actual error might be above the output! ${COLOR_RESET}"
- echo
- echo "###########################################################################################"
- else
- echo "########################################################################################################################"
- echo "${COLOR_BLUE} [IN CONTAINER] EXITING ${0} WITH EXIT CODE ${EXIT_CODE} ${COLOR_RESET}"
- echo "########################################################################################################################"
- fi
+ echo "########################################################################################################################"
+ echo "${COLOR_BLUE} [IN CONTAINER] EXITING ${0} WITH EXIT CODE ${EXIT_CODE} ${COLOR_RESET}"
+ echo "########################################################################################################################"
fi
fi