diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e31dbd69e70c69f6bdb1c6b0e8a8fe777c8037b9..3024b8cc342f9b5344564c7391b9692643a63812 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,17 +30,14 @@ default: .old-ruby-variables: &old-ruby-variables RUBY_VERSION: "3.0" CACHE_EDITION: "GITLAB_RUBY3_0" - USE_OLD_RUBY_VERSION: "true" .default-ruby-variables: &default-ruby-variables RUBY_VERSION: "3.1" CACHE_EDITION: "GITLAB_RUBY3_1" - USE_OLD_RUBY_VERSION: "true" .next-ruby-variables: &next-ruby-variables RUBY_VERSION: "3.2" CACHE_EDITION: "GITLAB_RUBY3_2" - USE_OLD_RUBY_VERSION: "false" .default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables CREATE_RAILS_TEST_FAILURE_ISSUES: "true" diff --git a/.gitlab/ci/qa-common/variables.gitlab-ci.yml b/.gitlab/ci/qa-common/variables.gitlab-ci.yml index 2ac1121791d96dd857e9ee07d7809acc95436434..8f24cf1f5e59ce8db03d2f5367c3a47c3eb1f2ce 100644 --- a/.gitlab/ci/qa-common/variables.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/variables.gitlab-ci.yml @@ -1,7 +1,6 @@ # Default variables for package-and-test variables: - USE_OLD_RUBY_VERSION: "true" REGISTRY_HOST: "registry.gitlab.com" REGISTRY_GROUP: "gitlab-org" ALLURE_JOB_NAME: $CI_PROJECT_NAME diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 379164e4accd290f51a9d6f063f2e7b4dfa6db4f..b7716fc280eab8790addbea63c5d838a066e0d18 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -90,7 +90,6 @@ trigger-omnibus: TOP_UPSTREAM_SOURCE_PROJECT: $CI_PROJECT_PATH SECURITY_SOURCES: $SECURITY_SOURCES CACHE_UPDATE: $OMNIBUS_GITLAB_CACHE_UPDATE - USE_OLD_RUBY_VERSION: $USE_OLD_RUBY_VERSION CACHE_EDITION: $CACHE_EDITION NEXT_RUBY_VERSION: $FULL_RUBY_VERSION BUILD_ON_ALL_OS: $OMNIBUS_GITLAB_BUILD_ON_ALL_OS diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index a95fccf6e8fe3f221c2a121ee3afad8f2bce4d9d..47bc73a9558bf399b003cd9bf325ca89b865a945 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -206,7 +206,6 @@ trigger-omnibus-env: echo "OMNIBUS_GITLAB_CACHE_UPDATE=${OMNIBUS_GITLAB_CACHE_UPDATE:-false}" >> $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 "USE_OLD_RUBY_VERSION=${USE_OLD_RUBY_VERSION:-false}" >> $BUILD_ENV ruby -e 'puts "FULL_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