QE: Update Ruby from 2.5 to 3.3

See https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/ Signed-off-by: Dominik Gedon <dominik.gedon@suse.com>
nodeg · Aug 26, 2024 · ff24f0a · ff24f0a
1 parent a560f41
commit ff24f0a
Show file tree

Hide file tree

Showing 21 changed files with 388 additions and 125 deletions.
diff --git a/.github/workflows/acceptance_tests_common.yml b/.github/workflows/acceptance_tests_common.yml
@@ -9,7 +9,7 @@ on:
         required: true
         type: string
 env:
-  UYUNI_PROJECT: uyuni-project
+  UYUNI_PROJECT: nodeg
   UYUNI_VERSION: master
   CUCUMBER_PUBLISH_TOKEN: ${{ secrets.CUCUMBER_PUBLISH_TOKEN }}
 jobs:
@@ -66,9 +66,9 @@ jobs:
       - name: create-podman-network
         run: ./testsuite/podman_runner/02_setup_network.sh
       - name: start_controller
-        run: ./testsuite/podman_runner/03_run_controller.sh 
+        run: ./testsuite/podman_runner/03_run_controller.sh
       - name: create_ssh_conf
-        run: ./testsuite/podman_runner/04_setup_ssh_controller.sh 
+        run: ./testsuite/podman_runner/04_setup_ssh_controller.sh
       - name: install_gems_in_controller
         run: ./testsuite/podman_runner/05_install_gems_in_controller.sh
       - name: collect_and_tag_flaky_tests_in_controller
@@ -110,7 +110,7 @@ jobs:
       - name: split_secondary
         run: ./testsuite/podman_runner/19_split_secondary_p_tests.sh
       - name: run_secondary_tests
-        run: ./testsuite/podman_runner/${{ inputs.secondary_tests }} 
+        run: ./testsuite/podman_runner/${{ inputs.secondary_tests }}
       - name: get_server_logs
         if: ${{ failure() }}
         run: ./testsuite/podman_runner/20_get_server_logs.sh ${{ inputs.server_id }}

diff --git a/.github/workflows/build_containers.yml b/.github/workflows/build_containers.yml
@@ -38,7 +38,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             BASE=registry.opensuse.org/uyuni/server
-            VERSION=2024.05
+            VERSION=2024.07
   build-and-push-ubuntu-minion-image:
     runs-on: ubuntu-latest
     permissions:

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -17,19 +17,11 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.5'
+        ruby-version: '3.3'
 
     - name: Install Rubocop
       run: |
-        gem install parallel -v 1.10
-        gem install parser -v 3.0.0.0
-        gem install rainbow -v 2.2.2
-        gem install regexp_parser -v 1.8
-        gem install rexml
-        gem install rubocop-ast -v 1.7.0
-        gem install ruby-progressbar -v 1.7
-        gem install unicode-display_width -v 1.4.0
-        gem install rubocop -v 1.17.0
+        gem install rubocop -v 1.65.1
 
     - name: Run RuboCop
       run: |

diff --git a/testsuite/.rubocop.yml b/testsuite/.rubocop.yml
@@ -3,7 +3,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   EnabledByDefault: true
   SuggestExtensions: false
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.3
 
 Style/MissingElse:
   Enabled: false

diff --git a/testsuite/.rubocop_todo.yml b/testsuite/.rubocop_todo.yml
@@ -1,25 +1,158 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-11-17 13:57:32 UTC using RuboCop version 1.17.0.
+# on 2024-08-19 12:51:03 UTC using RuboCop version 1.65.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 31
-# Configuration parameters: RequireForNonPublicMethods.
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 26
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: leading, trailing
+Layout/LineContinuationLeadingSpace:
+  Exclude:
+    - 'features/step_definitions/command_steps.rb'
+    - 'features/step_definitions/vm_steps.rb'
+    - 'features/support/kubernetes.rb'
+
+# Offense count: 19
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, no_space
+Layout/LineContinuationSpacing:
+  Exclude:
+    - 'features/support/kubernetes.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/LineEndStringConcatenationIndentation:
+  Exclude:
+    - 'features/step_definitions/command_steps.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/SpaceAfterComma:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 1
+# Configuration parameters: DebuggerMethods, DebuggerRequires.
+Lint/Debugger:
+  Exclude:
+    - 'features/step_definitions/common_steps.rb'
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Lint/RedundantRequireStatement:
+  Exclude:
+    - 'features/step_definitions/command_steps.rb'
+    - 'features/support/cobbler_test.rb'
+    - 'features/support/env.rb'
+
+# Offense count: 1
+# Configuration parameters: LengthThreshold.
+Metrics/CollectionLiteralLength:
+  Exclude:
+    - 'features/support/constants.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, BlockForwardingName.
+# SupportedStyles: anonymous, explicit
+Naming/BlockForwarding:
+  Exclude:
+    - 'features/support/commonlib.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, conditionals
+Style/AndOr:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 10
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
+# RedundantRestArgumentNames: args, arguments
+# RedundantKeywordRestArgumentNames: kwargs, options, opts
+# RedundantBlockArgumentNames: blk, block, proc
+Style/ArgumentsForwarding:
+  Exclude:
+    - 'features/support/commonlib.rb'
+
+# Offense count: 48
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/ArrayFirstLast:
+  Exclude:
+    - 'ext-tools/collect_and_tag_flaky_tests.rb'
+    - 'ext-tools/maintenance_crawler.rb'
+    - 'features/step_definitions/api_common.rb'
+    - 'features/step_definitions/command_steps.rb'
+    - 'features/step_definitions/common_steps.rb'
+    - 'features/step_definitions/docker_steps.rb'
+    - 'features/step_definitions/salt_steps.rb'
+    - 'features/step_definitions/setup_steps.rb'
+    - 'features/step_definitions/smdba_steps.rb'
+    - 'features/step_definitions/vm_steps.rb'
+    - 'features/support/commonlib.rb'
+    - 'features/support/http_client.rb'
+    - 'features/support/namespaces/api.rb'
+    - 'features/support/twopence_init.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods, RequireForNonPublicMethods.
 Style/DocumentationMethod:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
     - 'features/support/commonlib.rb'
+    - 'features/support/twopence_init.rb'
+
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+# AllowedReceivers: Thread.current
+Style/HashEachMethods:
+  Exclude:
+    - 'Rakefile'
+    - 'features/step_definitions/command_steps.rb'
+    - 'features/step_definitions/setup_steps.rb'
+
+# Offense count: 91
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either, consistent, either_consistent
+Style/HashSyntax:
+  Exclude:
+    - 'ext-tools/collect_and_tag_flaky_tests.rb'
+    - 'features/step_definitions/command_steps.rb'
+    - 'features/step_definitions/docker_steps.rb'
+    - 'features/step_definitions/navigation_steps.rb'
+    - 'features/step_definitions/setup_steps.rb'
+    - 'features/support/commonlib.rb'
+    - 'features/support/lavanda.rb'
+    - 'features/support/namespaces/actionchain.rb'
+    - 'features/support/namespaces/activationkey.rb'
     - 'features/support/namespaces/channel.rb'
+    - 'features/support/namespaces/configchannel.rb'
     - 'features/support/namespaces/image.rb'
+    - 'features/support/namespaces/kickstart.rb'
     - 'features/support/namespaces/system.rb'
-    - 'features/support/twopence_init.rb'
+    - 'features/support/namespaces/user.rb'
 
-# Offense count: 16
-# Cop supports --auto-correct.
+# Offense count: 20
+# This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'features/step_definitions/cobbler_steps.rb'
@@ -32,9 +165,17 @@ Style/IfUnlessModifier:
     - 'features/step_definitions/vm_steps.rb'
     - 'features/support/http_client.rb'
 
-Style/InlineComment:
+# Offense count: 76
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: InverseMethods.
+Style/InvertibleUnlessCondition:
+  Enabled: false
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/MapIntoArray:
   Exclude:
-    - 'features/support/constants.rb'
+    - 'features/support/cobbler_test.rb'
 
 # Offense count: 7
 # Configuration parameters: AllowedMethods.
@@ -46,9 +187,85 @@ Style/OptionalBooleanParameter:
     - 'features/support/http_client.rb'
     - 'features/support/lavanda.rb'
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/RedundantFilterChain:
+  Exclude:
+    - 'features/step_definitions/api_common.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantParentheses:
+  Exclude:
+    - 'features/step_definitions/retail_steps.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpArgument:
+  Exclude:
+    - 'features/step_definitions/command_steps.rb'
+    - 'features/step_definitions/salt_steps.rb'
+    - 'features/support/lavanda.rb'
+
+# Offense count: 25
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantStringEscape:
+  Exclude:
+    - 'features/step_definitions/cobbler_steps.rb'
+    - 'features/step_definitions/command_steps.rb'
+    - 'features/step_definitions/file_management_steps.rb'
+    - 'features/step_definitions/smdba_steps.rb'
+    - 'features/step_definitions/vm_steps.rb'
+
+# Offense count: 35
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/RequireOrder:
+  Exclude:
+    - 'Rakefile'
+    - 'ext-tools/collect_and_tag_flaky_tests.rb'
+    - 'ext-tools/maintenance_crawler.rb'
+    - 'features/step_definitions/command_steps.rb'
+    - 'features/step_definitions/common_steps.rb'
+    - 'features/step_definitions/docker_steps.rb'
+    - 'features/step_definitions/salt_steps.rb'
+    - 'features/step_definitions/security_steps.rb'
+    - 'features/support/api_test.rb'
+    - 'features/support/cobbler_test.rb'
+    - 'features/support/code_coverage.rb'
+    - 'features/support/commonlib.rb'
+    - 'features/support/env.rb'
+    - 'features/support/lavanda.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/SelectByRegexp:
+  Exclude:
+    - 'features/step_definitions/api_common.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperArguments:
+  Exclude:
+    - 'features/support/custom_formatter.rb'
+
 # Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: forbid_mixed_logical_operators, forbid_logical_operators
 Style/UnlessLogicalOperators:
   Exclude:
     - 'features/step_definitions/vm_steps.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/YAMLFileRead:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: .
+# SupportedOperators: *, +, &, |, ^
+Style/YodaExpression:
+  Exclude:
+    - 'features/support/commonlib.rb'
+    - 'features/support/env.rb'
diff --git a/testsuite/Gemfile b/testsuite/Gemfile
@@ -3,30 +3,29 @@
 
 source 'https://rubygems.org'
 
-gem 'capybara', '3.35.3'
-gem 'cucumber', '7.1.0'
-gem 'cucumber-html-formatter', '~> 17.0'
-gem 'faraday', '1.10.0'
-gem 'ffi', '~> 1.16.0'
-gem 'jwt', '~> 2.6'
-# mini_mime > 1.1.2, requires ruby 2.6
-gem 'mime-types', '~> 3.4'
-gem 'mini_mime', '1.1.2'
-gem 'minitest', '~> 5.15.0'
+gem 'capybara', '3.40.0'
+gem 'cucumber', '9.2.0'
+gem 'cucumber-html-formatter', '21.7.0'
+gem 'faraday', '~>2.10.1'
+gem 'ffi', '~> 1.17'
+gem 'jwt', '~> 2.8'
+gem 'mime-types', '~> 3.5'
+gem 'mini_mime', '1.1.5'
+gem 'minitest', '~> 5.25.1'
 gem 'netrc', '~> 0.11.0'
-gem 'nokogiri', '~> 1.12.0'
-gem 'parallel_tests', '~> 3.12.0'
-gem 'parallel', '~> 1.24.0'
-gem 'pg', '~> 1.4'
-gem 'public_suffix', '~> 4.0'
-gem 'rack', '~> 3.0'
-gem 'rack-test', '~> 2.0'
-gem 'rake', '~> 13.0'
-gem 'redis', '~> 5.0'
-gem 'redis-client', '~> 0.19.1'
+gem 'nokogiri', '~> 1.16'
+gem 'parallel', '~> 1.26'
+gem 'parallel_tests', '~> 4.7'
+gem 'pg', '~> 1.5'
+gem 'public_suffix', '~> 6.0'
+gem 'rack', '~> 3.1'
+gem 'rack-test', '~> 2.1'
+gem 'rake', '~> 13.2'
+gem 'redis', '~> 5.2'
+gem 'redis-client', '~> 0.22'
 gem 'require_all', '~> 3.0'
-# gem 'rubocop', '1.17.0'
-gem 'selenium-webdriver', '~> 3.142'
+gem 'rubocop', '1.65.1'
+gem 'selenium-webdriver', '4.23.0'
 gem 'simplecov', '~> 0.22'
 gem 'syntax', '~> 1.2'
 # Pre-requisite: