diff --git a/cmd/pj-rehearse/main.go b/cmd/pj-rehearse/main.go index f8a2fc2c863..2129b6c7f02 100644 --- a/cmd/pj-rehearse/main.go +++ b/cmd/pj-rehearse/main.go @@ -80,20 +80,20 @@ func validateOptions(o options) error { } const ( - misconfigurationOutput = `[ERROR] pj-rehearse: misconfiguration + misconfigurationOutput = `ERROR: pj-rehearse: misconfiguration pj-rehearse could not process its necessary inputs properly. No rehearsal jobs were run. This is likely a pj-rehearse job configuration problem.` - rehearseFailureOutput = `[ERROR] pj-rehearse: rehearsal tool failure + rehearseFailureOutput = `ERROR: pj-rehearse: rehearsal tool failure pj-rehearse attempted to submit jobs for rehearsal, but it failed to either submit them or to fetch their results. This is either a pj-rehearse bug or an infrastructure issue.` - jobsFailureOutput = `[ERROR] pj-rehearse: rehearsed jobs failure + jobsFailureOutput = `ERROR: pj-rehearse: rehearsed jobs failure pj-rehearse rehearsed jobs and at least one of them failed. This means that job would fail when executed against the current HEAD of the target branch.` - failedSetupOutput = `[ERROR] pj-rehearse: setup failure + failedSetupOutput = `ERROR: pj-rehearse: setup failure pj-rehearse failed to finish all setup necessary to perform job rehearsals. This is either a pj-rehearse bug or an infrastructure failure.` diff --git a/test/pj-rehearse-integration/run.sh b/test/pj-rehearse-integration/run.sh index 8649f35a4a4..558a75b5a19 100755 --- a/test/pj-rehearse-integration/run.sh +++ b/test/pj-rehearse-integration/run.sh @@ -53,7 +53,7 @@ make_testing_repository readonly REHEARSED_JOBS="${WORKDIR}/rehearsals.yaml" echo "[INFO] Running pj-rehearse in dry-mode..." if ! pj-rehearse --dry-run=true --no-fail=false --allow-volumes=true --candidate-path "${FAKE_OPENSHIFT_RELEASE}" > "${REHEARSED_JOBS}" 2> "${WORKDIR}/pj-rehearse-stderr.log"; then - echo "[ERROR] pj-rehearse failed:" + echo "ERROR: pj-rehearse failed:" cat "${WORKDIR}/pj-rehearse-stderr.log" exit 1 fi @@ -61,8 +61,8 @@ fi echo "[INFO] Validating created rehearsals" if ! output="$(compare_to_expected "${REHEARSED_JOBS}")"; then cat "${WORKDIR}/pj-rehearse-stderr.log" - output="$( printf -- "${output}" | sed 's/^/[ERROR] /' )" - printf "[ERROR] pj-rehearse output differs from expected:\n\n$output\n" + output="$( printf -- "${output}" | sed 's/^/ERROR: /' )" + printf "ERROR: pj-rehearse output differs from expected:\n\n$output\n" exit 1 fi diff --git a/test/prowgen-integration/run.sh b/test/prowgen-integration/run.sh index fac6a3c2e49..a8fc29b0fe9 100755 --- a/test/prowgen-integration/run.sh +++ b/test/prowgen-integration/run.sh @@ -25,8 +25,8 @@ ci-operator-prowgen --from-dir "${input_config_dir}" --to-dir "${generated_outpu echo "[INFO] Validating generated Prow jobs..." if ! diff -Naupr "${expected_output_jobs_dir}" "${generated_output_jobs_dir}"> "${workdir}/diff"; then cat << EOF -[ERROR] Incorrect Prow jobs were generated! -[ERROR] The following errors were found: +ERROR: Incorrect Prow jobs were generated! +ERROR: The following errors were found: EOF cat "${workdir}/diff" @@ -43,8 +43,8 @@ determinize-prow-jobs --prow-jobs-dir "${determinized_output_jobs_dir}" echo "[INFO] Validating determinized Prow jobs..." if ! diff -Naupr "${determinized_output_jobs_dir}" "${generated_output_jobs_dir}"> "${workdir}/diff"; then cat << EOF -[ERROR] Prow job generator did not output determinized jobs! -[ERROR] The following errors were found: +ERROR: Prow job generator did not output determinized jobs! +ERROR: The following errors were found: EOF cat "${workdir}/diff" diff --git a/test/validate-prowgen-breaking-changes.sh b/test/validate-prowgen-breaking-changes.sh index 25a11d8cc5c..b030690fb94 100755 --- a/test/validate-prowgen-breaking-changes.sh +++ b/test/validate-prowgen-breaking-changes.sh @@ -14,11 +14,11 @@ ci-operator-prowgen --from-dir "${workdir}/release/ci-operator/config" --to-dir pushd "${workdir}/release" if [ -n "$(git status --porcelain)" ]; then - echo "[ERROR] Changes in openshift/release:" + echo "ERROR: Changes in openshift/release:" git diff - echo "[ERROR] Running Prowgen in openshift/release results in changes ^^^" - echo "[ERROR] To avoid breaking openshift/release for everyone you should regenerate" - echo "[ERROR] the jobs there and merge the changes ASAP after this change to Prowgen" + echo "ERROR: Running Prowgen in openshift/release results in changes ^^^" + echo "ERROR: To avoid breaking openshift/release for everyone you should regenerate" + echo "ERROR: the jobs there and merge the changes ASAP after this change to Prowgen" popd exit 1 else