diff --git a/conf/gitlab.rb b/conf/gitlab.rb index cd80802..80a5d90 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1320,9 +1320,7 @@ puma['port'] = __PORT_PUMA__ # sidekiq['log_format'] = "json" # sidekiq['shutdown_timeout'] = 4 # sidekiq['interval'] = nil -# sidekiq['concurrency'] = nil -# sidekiq['max_concurrency'] = 20 -# sidekiq['min_concurrency'] = nil +# sidekiq['concurrency'] = 20 ##! GitLab allows route a job to a particular queue determined by an array of ##! routing rules. ##! Each routing rule is a tuple of queue selector query and corresponding queue. By default, diff --git a/manifest.toml b/manifest.toml index 4f84440..bfbd1ac 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "GitLab" description.en = "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features" description.fr = "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD" -version = "16.11.2~ynh1" +version = "17.0.0~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.16.last.sh b/scripts/upgrade.d/upgrade.16.last.sh new file mode 100644 index 0000000..1d6e233 --- /dev/null +++ b/scripts/upgrade.d/upgrade.16.last.sh @@ -0,0 +1,76 @@ +#!/bin/bash + +gitlab_version="16.11.2" + +# Upgrade path: https://gitlab-com.gitlab.io/support/toolbox/upgrade-path/ +# sha256sum found here: https://packages.gitlab.com/gitlab +gitlab_debian_version="$(lsb_release -sc)" + +gitlab_x86_64_bookworm_source_sha256="339c827c08697817df5ed05387df9a58d2bf138181bb9c2b7b11a3803ab12e7c" +gitlab_x86_64_bullseye_source_sha256="6199c64689c31cf48225d064001f645540c139931699930fba4a9ad1e539c205" +gitlab_x86_64_buster_source_sha256="433bd5d6d2988b276d3767912e3035f3eb913d7e98a7ceb46e0325a4be0af0b4" + +gitlab_arm64_bookworm_source_sha256="98e259ffe7c1466836b762c7b41e7d1203b31cc440129046ec1ca0072ae76df1" +gitlab_arm64_bullseye_source_sha256="9c53d88dff37bd64b1e5d9832edec5984a6420475d21dc32cb46281268eaafec" +gitlab_arm64_buster_source_sha256="951bb731adf2177b1fd74b0cc0f774cd7ee3b4ea951216cf1f245a78bcbc6159" + +gitlab_arm_bookworm_source_sha256="" +gitlab_arm_bullseye_source_sha256="56180fb6c7565fbccff14d868ccb3412a89c11212726a91e576df8fce5d79288" +gitlab_arm_buster_source_sha256="b5e42c8f3c32683df957d1522c39af0165a33e27132a55fb18690db56f662ab8" + +architecture=$(ynh_app_setting_get --app="$app" --key=architecture) + +# Evaluating indirect/reference variables https://mywiki.wooledge.org/BashFAQ/006#Indirection +# ref=gitlab_${architecture}_${gitlab_debian_version}_source_sha256 +# gitlab_source_sha256=${!ref} + +if [ "$architecture" = "x86-64" ]; then + if [ "$gitlab_debian_version" = "bookworm" ] + then + gitlab_source_sha256=$gitlab_x86_64_bookworm_source_sha256 + elif [ "$gitlab_debian_version" = "bullseye" ] + then + gitlab_source_sha256=$gitlab_x86_64_bullseye_source_sha256 + elif [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256 + fi +elif [ "$architecture" = "arm64" ]; then + if [ "$gitlab_debian_version" = "bookworm" ] + then + gitlab_source_sha256=$gitlab_arm64_bookworm_source_sha256 + elif [ "$gitlab_debian_version" = "bullseye" ] + then + gitlab_source_sha256=$gitlab_arm64_bullseye_source_sha256 + elif [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_arm64_buster_source_sha256 + fi +elif [ "$architecture" = "arm" ]; then + if [ "$gitlab_debian_version" = "bookworm" ] + then + gitlab_source_sha256=$gitlab_arm_bookworm_source_sha256 + if [ -z "$gitlab_arm_bookworm_source_sha256" ] + then + gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256 + fi + elif [ "$gitlab_debian_version" = "bullseye" ] + then + gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256 + elif [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_arm_buster_source_sha256 + fi +fi + +gitlab_filename="gitlab-ce-${gitlab_version}.deb" + +# Action to do in case of failure of the package_check +package_check_action() { + ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb" + cat <> "$config_path/gitlab.rb" +# Last chance to fix Gitlab +package['modify_kernel_parameters'] = false +EOF + ynh_store_file_checksum --file="$config_path/gitlab.rb" +} diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 1d6e233..103fed2 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,22 +1,22 @@ #!/bin/bash -gitlab_version="16.11.2" +gitlab_version="17.0.0" # Upgrade path: https://gitlab-com.gitlab.io/support/toolbox/upgrade-path/ # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bookworm_source_sha256="339c827c08697817df5ed05387df9a58d2bf138181bb9c2b7b11a3803ab12e7c" -gitlab_x86_64_bullseye_source_sha256="6199c64689c31cf48225d064001f645540c139931699930fba4a9ad1e539c205" -gitlab_x86_64_buster_source_sha256="433bd5d6d2988b276d3767912e3035f3eb913d7e98a7ceb46e0325a4be0af0b4" +gitlab_x86_64_bookworm_source_sha256="e8578507c0f14253a7d702e8305c9689742da89e8ff25c1c43f485f64d7a0bb3" +gitlab_x86_64_bullseye_source_sha256="ac33d4abf6856067c26b74ab263819db80111a1a0dd5e159e2a2a8f865b4f67f" +gitlab_x86_64_buster_source_sha256="31790cddd976a803a79dcb2ab62a0420e223c0ac80f23a91684cbe21b513aa09" -gitlab_arm64_bookworm_source_sha256="98e259ffe7c1466836b762c7b41e7d1203b31cc440129046ec1ca0072ae76df1" -gitlab_arm64_bullseye_source_sha256="9c53d88dff37bd64b1e5d9832edec5984a6420475d21dc32cb46281268eaafec" -gitlab_arm64_buster_source_sha256="951bb731adf2177b1fd74b0cc0f774cd7ee3b4ea951216cf1f245a78bcbc6159" +gitlab_arm64_bookworm_source_sha256="a885abfbf62f1993d00fc639a3aa60ce577fce9cb099f87bf48530d4f9fa530d" +gitlab_arm64_bullseye_source_sha256="7e8b3210983b1260cda9ea935dc517c71485da0040f8a2964fc4bee60ca20648" +gitlab_arm64_buster_source_sha256="41a82d681025493103b9aaae5d701576fb3ba34d16c28696e0b2a8148790101e" gitlab_arm_bookworm_source_sha256="" -gitlab_arm_bullseye_source_sha256="56180fb6c7565fbccff14d868ccb3412a89c11212726a91e576df8fce5d79288" -gitlab_arm_buster_source_sha256="b5e42c8f3c32683df957d1522c39af0165a33e27132a55fb18690db56f662ab8" +gitlab_arm_bullseye_source_sha256="15ab0c73b8708aeba897d1c7d55f5b487ff6996c66bfb0f6b115075dee274c6a" +gitlab_arm_buster_source_sha256="30dd1a11f50de3b9c2e73cbbb833a53b23d1e62db63ac6c9c29dfa000132a04c" architecture=$(ynh_app_setting_get --app="$app" --key=architecture)