YunoHost/package_check
1
0
Fork 0
mirror of https://github.com/YunoHost/package_check.git synced 2024-09-03 20:06:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #91 from YunoHost/fix_level_definition

Browse source 
Cleanup + fix level computation
This commit is contained in:
Kayou 2020-12-02 19:08:32 +01:00 • committed by GitHub
commit 1ec0d6bbe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 102 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
package_check.sh
View file

@ -617,114 +617,68 @@ TEST_RESULTS () {
test -n "${level[5]}" || level[5]=auto test -n "${level[5]}" || level[5]=auto
test -n "${level[6]}" || level[6]=auto test -n "${level[6]}" || level[6]=auto
test -n "${level[7]}" || level[7]=auto test -n "${level[7]}" || level[7]=auto
test -n "${level[8]}" || level[8]=0 test -n "${level[8]}" || level[8]=auto
test -n "${level[9]}" || level[9]=0 test -n "${level[9]}" || level[9]=0
test -n "${level[10]}" || level[10]=0 test -n "${level[10]}" || level[10]=0
# Check if the level can be changed pass_level_1() {
level_can_change () { # -> The package can be install and remove.
# If the level is set at auto, it's waiting for a change [ $RESULT_global_setup -eq 1 ] && \
# And if it's set at 2, its value can be modified by a new result [ $RESULT_global_remove -eq 1 ]
if [ "${level[$1]}" == "auto" ] || [ "${level[$1]}" -eq 2 ]
then
return 0
fi
return 1
} }
# Evaluate the first level pass_level_2() {
# -> The package can be install and remove.
if level_can_change 1
then
# Validated if at least one install and remove work fine
if [ $RESULT_global_setup -eq 1 ] && \
[ $RESULT_global_remove -eq 1 ]
then level[1]=2
else level[1]=0
fi
fi
# Evaluate the second level
# -> The package can be install and remove in all tested configurations. # -> The package can be install and remove in all tested configurations.
if level_can_change 2
then
# Validated if none install failed # Validated if none install failed
if [ $RESULT_check_sub_dir -ne -1 ] && \ [ $RESULT_check_sub_dir -ne -1 ] && \
[ $RESULT_check_remove_sub_dir -ne -1 ] && \ [ $RESULT_check_remove_sub_dir -ne -1 ] && \
[ $RESULT_check_root -ne -1 ] && \ [ $RESULT_check_root -ne -1 ] && \
[ $RESULT_check_remove_root -ne -1 ] && \ [ $RESULT_check_remove_root -ne -1 ] && \
[ $RESULT_check_private -ne -1 ] && \ [ $RESULT_check_private -ne -1 ] && \
[ $RESULT_check_public -ne -1 ] && \ [ $RESULT_check_public -ne -1 ] && \
[ $RESULT_check_multi_instance -ne -1 ] [ $RESULT_check_multi_instance -ne -1 ]
then level[2]=2 }
else level[2]=0
fi
fi
# Evaluate the third level pass_level_3() {
# -> The package can be upgraded from the same version. # -> The package can be upgraded from the same version.
if level_can_change 3
then
# Validated if the upgrade is ok. Or if the upgrade has been not tested but already validated before. # Validated if the upgrade is ok. Or if the upgrade has been not tested but already validated before.
if [ $RESULT_check_upgrade -eq 1 ] || \ [ $RESULT_check_upgrade -eq 1 ] || \
( [ $RESULT_check_upgrade -ne -1 ] && \ ( [ $RESULT_check_upgrade -ne -1 ] && \
[ "${level[3]}" == "2" ] ) [ "${level[3]}" == "2" ] )
then level[3]=2 }
else level[3]=0
fi
fi
# Evaluate the fourth level pass_level_4() {
# -> The package can be backup and restore without error # -> The package can be backup and restore without error
if level_can_change 4
then
# Validated if backup and restore are ok. Or if backup and restore have been not tested but already validated before. # Validated if backup and restore are ok. Or if backup and restore have been not tested but already validated before.
if ( [ $RESULT_check_backup -eq 1 ] && \ ( [ $RESULT_check_backup -eq 1 ] && \
[ $RESULT_check_restore -eq 1 ] ) || \ [ $RESULT_check_restore -eq 1 ] ) || \
( [ $RESULT_check_backup -ne -1 ] && \ ( [ $RESULT_check_backup -ne -1 ] && \
[ $RESULT_check_restore -ne -1 ] && \ [ $RESULT_check_restore -ne -1 ] && \
[ "${level[4]}" == "2" ] ) [ "${level[4]}" == "2" ] )
then level[4]=2 }
else level[4]=0
fi
fi
# Evaluate the fifth level pass_level_5() {
# -> The package have no error with package linter # -> The package have no error with package linter
# -> The package does not have any alias_traversal error # -> The package does not have any alias_traversal error
if level_can_change 5
then
# Validated if Linter is ok. Or if Linter has been not tested but already validated before. # Validated if Linter is ok. Or if Linter has been not tested but already validated before.
if [ $RESULT_linter -ge 1 ] || \ [ $RESULT_alias_traversal -ne 1 ] && \
([ $RESULT_linter -ge 1 ] || \
( [ $RESULT_linter -eq 0 ] && \ ( [ $RESULT_linter -eq 0 ] && \
[ "${level[5]}" == "2" ] ) [ "${level[5]}" == "2" ] ) )
then level[5]=2 }
else level[5]=0
fi
if [ $RESULT_alias_traversal -eq 1 ]
then
level[5]=0
fi
fi
# Evaluate the sixth level pass_level_6() {
# -> The package can be backup and restore without error # -> The package can be backup and restore without error
if level_can_change 6
then
# This is from the linter, tests if app is the Yunohost-apps organization # This is from the linter, tests if app is the Yunohost-apps organization
if [ $RESULT_linter_level_6 -eq 1 ] [ $RESULT_linter_level_6 -eq 1 ] || \
then level[6]=2 ([ $RESULT_linter_level_6 -eq 0 ] && \
else level[6]=0 [ "${level[6]}" == "2" ] )
fi }
fi
# Evaluate the seventh level pass_level_7() {
# -> None errors in all tests performed # -> None errors in all tests performed
if level_can_change 7
then
level[7]=0
# Validated if none errors is happened. # Validated if none errors is happened.
if [ $RESULT_global_setup -ne -1 ] && \ [ $RESULT_global_setup -ne -1 ] && \
[ $RESULT_global_remove -ne -1 ] && \ [ $RESULT_global_remove -ne -1 ] && \
[ $RESULT_check_sub_dir -ne -1 ] && \ [ $RESULT_check_sub_dir -ne -1 ] && \
[ $RESULT_check_remove_sub_dir -ne -1 ] && \ [ $RESULT_check_remove_sub_dir -ne -1 ] && \
@ -739,27 +693,41 @@ TEST_RESULTS () {
[ $RESULT_check_restore -ne -1 ] && \ [ $RESULT_check_restore -ne -1 ] && \
[ $RESULT_change_url -ne -1 ] && \ [ $RESULT_change_url -ne -1 ] && \
[ $RESULT_action_config_panel -ne -1 ] && \ [ $RESULT_action_config_panel -ne -1 ] && \
[ $RESULT_linter_level_7 -ge 1 ] ([ $RESULT_linter_level_7 -ge 1 ] ||
then ([ $RESULT_linter_level_7 -eq 0 ] && \
level[7]=2 [ "${level[8]}" == "2" ] ))
fi }
fi
# Evaluate the eighth level pass_level_8() {
# This happens in the linter # This happens in the linter
# When writing this, defined as app being maintained + long term quality (= # When writing this, defined as app being maintained + long term quality (=
# certain amount of time level 5+ in the last year) # certain amount of time level 5+ in the last year)
level[8]=0 [ $RESULT_linter_level_8 -ge 1 ] || \
if [ $RESULT_linter_level_8 -ge 1 ] ([ $RESULT_linter_level_8 -eq 0 ] && \
then [ "${level[8]}" == "2" ] )
level[8]=2 }
fi
# Check if the level can be changed
level_can_change () {
# If the level is set at auto, it's waiting for a change
# And if it's set at 2, its value can be modified by a new result
[ "${level[$1]}" == "auto" ] || [ "${level[$1]}" -eq 2 ]
}
if level_can_change 1; then pass_level_1 && level[1]=2 || level[1]=0; fi
if level_can_change 2; then pass_level_2 && level[2]=2 || level[2]=0; fi
if level_can_change 3; then pass_level_3 && level[3]=2 || level[3]=0; fi
if level_can_change 4; then pass_level_4 && level[4]=2 || level[4]=0; fi
if level_can_change 5; then pass_level_5 && level[5]=2 || level[5]=0; fi
if level_can_change 6; then pass_level_6 && level[6]=2 || level[6]=0; fi
if level_can_change 7; then pass_level_7 && level[7]=2 || level[7]=0; fi
if level_can_change 8; then pass_level_8 && level[8]=2 || level[8]=0; fi
# Evaluate the ninth level # Evaluate the ninth level
# -> High quality package. # -> High quality package.
# The level 9 can be validated only by the official list of app. # The level 9 can be validated only by the official list of app.
level[9]=0 level[9]=0
# Define the level 8 only if we're working on a repository. Otherwise, we can't assert that this is the correct app. # Define the level 9 only if we're working on a repository. Otherwise, we can't assert that this is the correct app.
if echo "$app_arg" | grep --extended-regexp --quiet "https?:\/\/" if echo "$app_arg" | grep --extended-regexp --quiet "https?:\/\/"
then then
# Get the name of the app from the repository name. # Get the name of the app from the repository name.
@ -815,7 +783,7 @@ TEST_RESULTS () {
fi fi
# If the package linter returned a critical error, the app is flagged as broken / level 0 # If the package linter returned a critical error, the app is flagged as broken / level 0
if [ $RESULT_linter -le -2 ] if [ $RESULT_linter_broken -eq 1 ]
then then
ECHO_FORMAT "The package linter reported a critical failure ! App is considered broken !\n" "red" "bold" ECHO_FORMAT "The package linter reported a critical failure ! App is considered broken !\n" "red" "bold"
global_level=0 global_level=0
@ -897,6 +865,7 @@ initialize_values() {
RESULT_linter_level_6=0 RESULT_linter_level_6=0
RESULT_linter_level_7=0 RESULT_linter_level_7=0
RESULT_linter_level_8=0 RESULT_linter_level_8=0
RESULT_linter_broken=0
RESULT_global_setup=0 RESULT_global_setup=0
RESULT_global_remove=0 RESULT_global_remove=0
RESULT_check_sub_dir=0 RESULT_check_sub_dir=0

8
sub_scripts/testing_process.sh
View file

@ -2010,6 +2010,7 @@ PACKAGE_LINTER () {
cat "$script_dir/temp_linter_result.log" | tee --append "$complete_log" cat "$script_dir/temp_linter_result.log" | tee --append "$complete_log"
cat "$script_dir/temp_linter_result.json" >> "$complete_log" cat "$script_dir/temp_linter_result.json" >> "$complete_log"
RESULT_linter_broken=0
RESULT_linter_level_6=0 RESULT_linter_level_6=0
RESULT_linter_level_7=0 RESULT_linter_level_7=0
RESULT_linter_level_8=0 RESULT_linter_level_8=0
@ -2034,10 +2035,11 @@ PACKAGE_LINTER () {
if [[ -n "$(cat "$script_dir/temp_linter_result.json" | jq ".critical" | grep -v '\[\]')" ]] if [[ -n "$(cat "$script_dir/temp_linter_result.json" | jq ".critical" | grep -v '\[\]')" ]]
then then
check_failed check_failed
RESULT_linter=-2 RESULT_linter_broken=1
RESULT_linter=-1
# If there are any regular errors, we'll cap to 4 # If there are any regular errors, we'll cap to 4
elif [[ -n "$(cat "$script_dir/temp_linter_result.json" | jq ".error" | grep -v '\[\]')" ]] elif [[ -n "$(cat "$script_dir/temp_linter_result.json" | jq ".error" | grep -v '\[\]')" ]]
then # FAil then
check_failed check_failed
RESULT_linter=-1 RESULT_linter=-1
# Otherwise, test pass (we'll display a warning depending on if there are # Otherwise, test pass (we'll display a warning depending on if there are
@ -2049,7 +2051,7 @@ PACKAGE_LINTER () {
RESULT_linter=1 RESULT_linter=1
else else
check_success check_success
RESULT_linter=2 RESULT_linter=1
fi fi
fi fi
} }