From 7f4b00740531f81924d295a1547a5d02555b19b9 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 14 Mar 2024 03:00:36 +0800 Subject: [PATCH] fix: error in truncate command with e2e script (#26443) --- e2e-tests/.ci/report.publish.sh | 11 +++++++---- e2e-tests/.ci/server.generate.sh | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/e2e-tests/.ci/report.publish.sh b/e2e-tests/.ci/report.publish.sh index 05c5472239..2c10061955 100755 --- a/e2e-tests/.ci/report.publish.sh +++ b/e2e-tests/.ci/report.publish.sh @@ -2,6 +2,7 @@ # SC2034: appears unused. # https://www.shellcheck.net/wiki/SC2034 # shellcheck disable=SC2034 +# shellcheck disable=SC2086,SC2223 set -e -u -o pipefail cd "$(dirname "$0")" @@ -32,10 +33,12 @@ if [ -n "${TM4J_API_KEY:-}" ]; then export JIRA_PROJECT_KEY=MM export TM4J_ENVIRONMENT_NAME="${TEST}/${BROWSER}/${SERVER}" case "${SERVER}" in - cloud) - export TM4J_FOLDER_ID="2014474" ;; - *) - export TM4J_FOLDER_ID="2014475" ;; + cloud) + export TM4J_FOLDER_ID="2014474" + ;; + *) + export TM4J_FOLDER_ID="2014475" + ;; esac : ${TEST_CYCLE_LINK_PREFIX:?} : ${TM4J_CYCLE_KEY:-} diff --git a/e2e-tests/.ci/server.generate.sh b/e2e-tests/.ci/server.generate.sh index 980a2c4057..fa3af7948b 100755 --- a/e2e-tests/.ci/server.generate.sh +++ b/e2e-tests/.ci/server.generate.sh @@ -259,7 +259,7 @@ EOL generate_env_files() { # Generate .env.server mme2e_log "Generating .env.server" - truncate --size=0 .env.server + truncate -s 0 .env.server # Setting SERVER-specific variables case "$SERVER" in @@ -287,7 +287,7 @@ generate_env_files() { case "$TEST" in cypress) mme2e_log "Cypress: Generating .env.cypress" - truncate --size=0 .env.cypress + truncate -s 0 .env.cypress mme2e_generate_envfile_from_var_names >.env.cypress <<-EOF BRANCH