Remove divergence about Ruby version

salt/controller/bashrc

@@ -116,10 +116,7 @@ export SERVER_INSTANCE_ID="{{ grains.get('server_instance_id') }}"
 export BETA_ENABLED="{{ grains.get('beta_enabled') }}"
 
 # Ruby specific settings
-# For 4.3 we currently still use Ruby 2.5
-{% if '4.3' not in grains.get('product_version') %}
 export GEM_PATH="/usr/lib64/ruby/gems/3.3.0"
-{% endif %}
 
 #### Generate certificates for Google Chrome
 if [ ! -f /etc/pki/trust/anchors/$SERVER.cert ]; then

salt/controller/init.sls

@@ -25,39 +25,6 @@ authorized_keys_controller:
     - source: salt://controller/id_rsa.pub
     - makedirs: True
 
-{% if '4.3' in grains.get('product_version') %}
-cucumber_requisites:
-  pkg.installed:
-    - pkgs:
-      - gcc
-      - make
-      - wget
-      - ruby
-      - ruby-devel
-      - autoconf
-      - ca-certificates-mozilla
-      - automake
-      - libtool
-      - apache2-worker
-      - cantarell-fonts
-      - git-core
-      - aaa_base-extras
-      - zlib-devel
-      - libxslt-devel
-      - mozilla-nss-tools
-      - postgresql-devel
-      - unzip
-      # packaged ruby gems
-      - ruby2.5-rubygem-bundler
-      - twopence
-      - python-twopence
-      - twopence-devel
-      - twopence-shell-client
-      - twopence-test-server
-      - rubygem-twopence
-    - require:
-      - sls: repos
-{% else %}
 cucumber_requisites:
   pkg.installed:
     - pkgs:
@@ -114,7 +81,6 @@ ruby_set_rdoc_version:
 ruby_set_ri_version:
   cmd.run:
     - name: update-alternatives --set ri /usr/bin/ri.ruby.ruby3.3
-{% endif %}
 
 install_chromium:
   pkg.installed:
@@ -134,23 +100,13 @@ install_npm:
   pkg.installed:
     - name: npm-default
 
-{% if '4.3' in grains.get('product_version') %}
-install_gems_via_bundle:
-  cmd.run:
-    - name: bundle.ruby2.5 install --gemfile Gemfile
-    - cwd: /root/spacewalk/testsuite
-    - require:
-      - pkg: cucumber_requisites
-      - cmd: spacewalk_git_repository
-{% else %}
 install_gems_via_bundle:
   cmd.run:
     - name: bundle.ruby3.3 install --gemfile Gemfile
     - cwd: /root/spacewalk/testsuite
     - require:
       - pkg: cucumber_requisites
       - cmd: spacewalk_git_repository
-{% endif %}
 
 # https://github.com/gkushang/cucumber-html-reporter
 install_cucumber_html_reporter_via_npm:

salt/repos/init.sls

@@ -15,10 +15,8 @@ include:
   - repos.testsuite
   - repos.tools
   - repos.jenkins
-  {% if '4.3' not in grains.get('product_version', '') %}
   - repos.ruby
   {% endif %}
-  {% endif %}
   - repos.additional
 
 {% if grains['os'] == 'SUSE' and grains['osfullname'] not in ['SLE Micro', 'SL-Micro'] %}