samuel
/
netoik-cicd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Dev] Remove double logs in runner

This commit is contained in:
samuel 2023-05-11 15:09:39 +02:00
parent 14ed4ab071
commit c74762858b
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/runner.sh
View File

@ -218,7 +218,6 @@ process_request() (
[ "${repo_tag}" != "null" ] && repo_id="${repo_tag}" [ "${repo_tag}" != "null" ] && repo_id="${repo_tag}"
rand="$(echo "${RANDOM}" | md5sum | head --bytes 7)" rand="$(echo "${RANDOM}" | md5sum | head --bytes 7)"
repo_clone="${runner_cloning_dir}/${repo_name}-${repo_id}-${rand}" repo_clone="${runner_cloning_dir}/${repo_name}-${repo_id}-${rand}"
log_info "Clone '${repo_name}'."
reply "Cloning repo '${repo_name}'..." reply "Cloning repo '${repo_name}'..."
if ! output="$(git clone "${repo_dir}" "${repo_clone}" 2>&1)"; then if ! output="$(git clone "${repo_dir}" "${repo_clone}" 2>&1)"; then
reply "Cannot clone repo '${repo_name}': ${output}." \ reply "Cannot clone repo '${repo_name}': ${output}." \
@ -228,7 +227,6 @@ process_request() (
cd "$repo_clone" cd "$repo_clone"
# Checkout git hash. # Checkout git hash.
log_info "Checkout hash ${repo_hash}."
reply "Checkouting hash '${repo_hash}..." reply "Checkouting hash '${repo_hash}..."
if ! output="$(git checkout "$repo_hash" 2>&1)"; then if ! output="$(git checkout "$repo_hash" 2>&1)"; then
reply "Cannot checkout hash '${repo_hash}': ${output}." \ reply "Cannot checkout hash '${repo_hash}': ${output}." \
@ -237,19 +235,16 @@ process_request() (
fi fi
# Check code validity. # Check code validity.
log_info "Check code format."
reply "Checking code format..." reply "Checking code format..."
if ! output="$(make check_format 2>&1)"; then if ! output="$(make check_format 2>&1)"; then
reply "Check format error: ${output}." "${err_check_format}" reply "Check format error: ${output}." "${err_check_format}"
return return
fi fi
log_info "Check code linting."
reply "Checking code linting..." reply "Checking code linting..."
if ! output="$(make check_linting 2>&1)"; then if ! output="$(make check_linting 2>&1)"; then
reply "Check linting error: ${output}." "${err_check_linting}" reply "Check linting error: ${output}." "${err_check_linting}"
return return
fi fi
log_info "Run unit tests."
reply "Running unit tests..." reply "Running unit tests..."
if ! output="$(make unit_test 2>&1)"; then if ! output="$(make unit_test 2>&1)"; then
reply "Unit test error: ${output}." "${err_unit_test}" reply "Unit test error: ${output}." "${err_unit_test}"
@ -263,13 +258,11 @@ process_request() (
fi fi
# Build rpm package. # Build rpm package.
log_info "Add git tag '${repo_tag}'."
reply "Adding tag '${repo_tag}'..." reply "Adding tag '${repo_tag}'..."
if ! output="$(git tag --message="$repo_tag" "$repo_tag" 2>&1)"; then if ! output="$(git tag --message="$repo_tag" "$repo_tag" 2>&1)"; then
reply "Cannot add git tag '${repo_tag}': ${output}." "${err_add_tag}" reply "Cannot add git tag '${repo_tag}': ${output}." "${err_add_tag}"
return return
fi fi
log_info "Make source tarball."
reply "Making source tarball..." reply "Making source tarball..."
if ! output="$(make tarball 2>&1)"; then if ! output="$(make tarball 2>&1)"; then
reply "Cannot make tarball for tag '${repo_tag}': ${output}." \ reply "Cannot make tarball for tag '${repo_tag}': ${output}." \
@ -277,7 +270,6 @@ process_request() (
return return
fi fi
repo_version="$(make version)" repo_version="$(make version)"
log_info "Build RPM package '${repo_name}' v${repo_version}."
reply "Building RPM package '${repo_name}' v${repo_version}..." reply "Building RPM package '${repo_name}' v${repo_version}..."
if ! output="$(rpmbuild -bb "$repo_name.spec" 2>&1)"; then if ! output="$(rpmbuild -bb "$repo_name.spec" 2>&1)"; then
reply "Cannot build rpm for tag '${repo_tag}': ${output}." \ reply "Cannot build rpm for tag '${repo_tag}': ${output}." \
@ -286,7 +278,6 @@ process_request() (
fi fi
# Deploy rpm package. # Deploy rpm package.
log_info "Deploy RPM package '${repo_name}' v${repo_version}."
reply "Deploying RPM package '${repo_name}' v${repo_version}..." reply "Deploying RPM package '${repo_name}' v${repo_version}..."
deployer_request="$(jq --null-input \ deployer_request="$(jq --null-input \
--compact-output \ --compact-output \