Revert "Merge branch 'sh-omnibus-cng-ruby-version' into 'master'"

This reverts merge request !152687

.gitlab-ci.yml

@@ -30,14 +30,10 @@ default:
 .default-ruby-variables: &default-ruby-variables
   RUBY_VERSION: "3.1"
   OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_1"
-  OMNIBUS_RUBY_VERSION: "3.1.5"
-  CNG_RUBY_VERSION: "3.1.5"
 
 .next-ruby-variables: &next-ruby-variables
   RUBY_VERSION: "3.2"
   OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_2"
-  OMNIBUS_RUBY_VERSION: "3.2.4"
-  CNG_RUBY_VERSION: "3.2.4"
 
 .default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables
   CREATE_RAILS_FLAKY_TEST_ISSUES: "true"

.gitlab/ci/cng/main.gitlab-ci.yml

@@ -24,7 +24,7 @@ include:
   script:
     - 'ruby -r./scripts/trigger-build.rb -e "puts Trigger.variables_for_env_file(Trigger::CNG.new.variables)" > $BUILD_ENV'
     - echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV
-    - echo "FULL_RUBY_VERSION=${CNG_RUBY_VERSION}" >> $BUILD_ENV
+    - ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> build.env
     - cat $BUILD_ENV
   artifacts:
     reports:

.gitlab/ci/setup.gitlab-ci.yml

@@ -242,7 +242,7 @@ trigger-omnibus-env:
       echo "OMNIBUS_GITLAB_CACHE_EDITION=${OMNIBUS_GITLAB_CACHE_EDITION}" >> $BUILD_ENV
       for version_file in *_VERSION; do echo "$version_file=$(cat $version_file)" >> $BUILD_ENV; done
       echo "OMNIBUS_GITLAB_BUILD_ON_ALL_OS=${OMNIBUS_GITLAB_BUILD_ON_ALL_OS:-false}" >> $BUILD_ENV
-      echo "FULL_RUBY_VERSION=${OMNIBUS_RUBY_VERSION}" >> $BUILD_ENV
+      ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> $BUILD_ENV
       echo "SHORT_RUBY_VERSION=${RUBY_VERSION}" >> $BUILD_ENV
       echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV
       echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV