From b6351a0db69e44842821dc111932112af5c20e2e Mon Sep 17 00:00:00 2001
From: Vishal Patel <vpatel@gitlab.com>
Date: Wed, 10 Apr 2024 05:47:08 +0000
Subject: [PATCH] Added a condition in saml test to change the config path
---
qa/qa/runtime/env.rb | 4 ++++
qa/qa/service/docker_run/saml_idp.rb | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index 6e26a1c64dd63..7c1d560d4cdb9 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -86,6 +86,10 @@ def ci_project_name
ENV['CI_PROJECT_NAME']
end
+ def ci_project_path
+ ENV['CI_PROJECT_PATH']
+ end
+
def schedule_type
ENV['SCHEDULE_TYPE']
end
diff --git a/qa/qa/service/docker_run/saml_idp.rb b/qa/qa/service/docker_run/saml_idp.rb
index c5bcd043a9c4d..a51ad5e7d69bf 100644
--- a/qa/qa/service/docker_run/saml_idp.rb
+++ b/qa/qa/service/docker_run/saml_idp.rb
@@ -97,7 +97,7 @@ def authsources
config = ERB.new(read_fixture('saml', "#{AUTHSOURCES_FILENAME}.erb")).result(binding)
::File.write(config_path, config)
- config_path.gsub("/home/gitlab/qa", "/builds/gitlab-org/gitlab/qa")
+ config_path.gsub("/home/gitlab/qa", "/builds/#{File.join(Runtime::Env.ci_project_path, 'qa')}")
end
end
end
--
GitLab