A platform for community discussion. Free, open, simple.
Revert "PERF: Run primary and parallel DB setup concurrently in CI (#… (#40301)
David Taylorf701ea3d0a17
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.ymlindex a84045b6a4f..742c9ca5d9d 100644--- a/.github/workflows/tests.yml+++ b/.github/workflows/tests.yml@@ -182,15 +182,16 @@ jobs:echo "127.0.0.1 minio.local" | sudo tee -a /etc/hostsecho "127.0.0.1 discoursetest.minio.local" | sudo tee -a /etc/hosts- - name: Create and migrate databases+ - name: Create and migrate databaserun: |- if [ "$USES_PARALLEL_DATABASES" = "true" ]; then- parallel --halt now,fail=1 --line-buffer ::: \- 'bin/rake db:create db:migrate' \- 'bin/rake parallel:create parallel:migrate'- else- bin/rake db:create db:migrate- fi+ bin/rake db:create+ bin/rake db:migrate++ - name: Create and migrate parallel databases+ if: env.USES_PARALLEL_DATABASES == 'true'+ run: |+ bin/rake parallel:create+ bin/rake parallel:migrate- name: Fetch turbo_rspec_runtime.log cacheuses: actions/cache@v5diff --git a/lib/backup_restore/s3_backup_store.rb b/lib/backup_restore/s3_backup_store.rbindex 8836b54d029..b793a482a28 100644--- a/lib/backup_restore/s3_backup_store.rb+++ b/lib/backup_restore/s3_backup_store.rb@@ -71,7 +71,7 @@ module BackupRestorefolder_prefix = s3_helper.s3_bucket_folder_path.nil? ? "" : s3_helper.s3_bucket_folder_pathif Rails.env.test?- folder_prefix = File.join(folder_prefix, "test_#{Discourse.test_env_number}")+ folder_prefix = File.join(folder_prefix, "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}")endfolder_prefixdiff --git a/lib/discourse.rb b/lib/discourse.rbindex 4a6a3095b1a..5c021429be8 100644--- a/lib/discourse.rb+++ b/lib/discourse.rb@@ -1285,11 +1285,6 @@ module DiscourseENV["RAILS_ENV"] == "test" && ENV["TEST_ENV_NUMBER"]end- def self.test_env_number- return "0" if ENV["TEST_ENV_NUMBER"].nil?- ENV["TEST_ENV_NUMBER"].presence || "1"- end-def self.apply_cdn_headers(headers)headers["Access-Control-Allow-Origin"] = "*"enddiff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rbindex ed42bace8c5..4b1315f114c 100644--- a/lib/file_store/base_store.rb+++ b/lib/file_store/base_store.rb@@ -40,7 +40,7 @@ module FileStoredef upload_pathpath = File.join("uploads", RailsMultisite::ConnectionManagement.current_db)return path if !Rails.env.test?- File.join(path, "test_#{Discourse.test_env_number}")+ File.join(path, "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}")enddef self.temporary_upload_path(file_name, folder_prefix: "")@@ -155,7 +155,7 @@ module FileStoreCACHE_DIR =if Rails.env.test?- "#{Rails.root.join("tmp/download_cache_test_#{Discourse.test_env_number}/")}"+ "#{Rails.root.join("tmp/download_cache_test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}/")}"else"#{Rails.root.join("tmp/download_cache/")}"enddiff --git a/lib/s3_helper.rb b/lib/s3_helper.rbindex 8d655dc3ac6..28b6effa66c 100644--- a/lib/s3_helper.rb+++ b/lib/s3_helper.rb@@ -482,7 +482,7 @@ class S3Helperdef multisite_upload_pathpath = File.join("uploads", RailsMultisite::ConnectionManagement.current_db, "/")return path if !Rails.env.test?- File.join(path, "test_#{Discourse.test_env_number}", "/")+ File.join(path, "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}", "/")enddef s3_resourcediff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rbindex 4fb83f93782..37e6c9ee8ba 100644--- a/lib/stylesheet/manager.rb+++ b/lib/stylesheet/manager.rb@@ -156,7 +156,7 @@ class Stylesheet::Managerdef self.manifest_full_pathpath = "#{MANIFEST_DIR}/stylesheet-manifest"return path if !Rails.env.test?- "#{path}-test_#{Discourse.test_env_number}"+ "#{path}-test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}"endprivate_class_method :manifest_full_path@@ -196,7 +196,7 @@ class Stylesheet::Managerdef self.cache_fullpathpath = "#{Rails.root.join("#{CACHE_PATH}")}"return path if !Rails.env.test?- File.join(path, "test_#{Discourse.test_env_number}")+ File.join(path, "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}")endif Rails.env.test?diff --git a/spec/lib/backup_restore/uploads_restorer_spec.rb b/spec/lib/backup_restore/uploads_restorer_spec.rbindex 6de72ce0cb7..aae63c39a54 100644--- a/spec/lib/backup_restore/uploads_restorer_spec.rb+++ b/spec/lib/backup_restore/uploads_restorer_spec.rb@@ -99,7 +99,7 @@ RSpec.describe BackupRestore::UploadsRestorer dodef uploads_path(database)path = File.join("uploads", database)- path = File.join(path, "test_#{Discourse.test_env_number}")+ path = File.join(path, "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}")"/#{path}/"enddiff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rbindex b24dea7900a..219e1912f4a 100644--- a/spec/requests/admin/backups_controller_spec.rb+++ b/spec/requests/admin/backups_controller_spec.rb@@ -983,7 +983,7 @@ RSpec.describe Admin::BackupsController dodescribe "S3 multipart uploads" dolet(:upload_type) { "backup" }- let(:test_bucket_prefix) { "test_#{Discourse.test_env_number}" }+ let(:test_bucket_prefix) { "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}" }let(:backup_file_exists_response) { { status: 404 } }let(:mock_multipart_upload_id) do"ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--"diff --git a/spec/requests/theme_javascripts_controller_spec.rb b/spec/requests/theme_javascripts_controller_spec.rbindex 4fb55b6c14e..578d65775db 100644--- a/spec/requests/theme_javascripts_controller_spec.rb+++ b/spec/requests/theme_javascripts_controller_spec.rb@@ -173,7 +173,7 @@ RSpec.describe ThemeJavascriptsController doregisterSettings(#{component.id}, {"num_setting": 5,"theme_uploads": {- "vendorlib": "/uploads/default/test_#{Discourse.test_env_number}/original/1X/#{js_upload.sha1}.js"+ "vendorlib": "/uploads/default/test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}/original/1X/#{js_upload.sha1}.js"},"theme_uploads_local": {"vendorlib": "/theme-javascripts/#{theme_javascript_hash}.js?__ws=test.localhost"diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rbindex 04284f53ebf..034c5d5516e 100644--- a/spec/requests/uploads_controller_spec.rb+++ b/spec/requests/uploads_controller_spec.rb@@ -1069,7 +1069,7 @@ RSpec.describe UploadsController dolet(:mock_multipart_upload_id) do"ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--"end- let(:test_bucket_prefix) { "test_#{Discourse.test_env_number}" }+ let(:test_bucket_prefix) { "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}" }before dosign_in(user)diff --git a/spec/services/video_conversion/aws_media_convert_adapter_spec.rb b/spec/services/video_conversion/aws_media_convert_adapter_spec.rbindex b28eeccbc42..442e0f434fb 100644--- a/spec/services/video_conversion/aws_media_convert_adapter_spec.rb+++ b/spec/services/video_conversion/aws_media_convert_adapter_spec.rb@@ -108,7 +108,7 @@ RSpec.describe VideoConversion::AwsMediaConvertAdapter dodescribe "#convert" dolet(:output_path) do- "/uploads/default/test_#{Discourse.test_env_number}/original/1X/#{new_sha1}"+ "/uploads/default/test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}/original/1X/#{new_sha1}"endlet(:job_id) { "job-123" }