Commit 0f7c4b2f authored by Thong Kuah's avatar Thong Kuah

Use available ::Gitlab::Git::COMMIT_ID constant

parent cc17af1f
...@@ -6,8 +6,6 @@ module TestEnv ...@@ -6,8 +6,6 @@ module TestEnv
ComponentFailedToInstallError = Class.new(StandardError) ComponentFailedToInstallError = Class.new(StandardError)
SHA_REGEX = /\A[0-9a-f]{5,40}\z/i.freeze
# When developing the seed repository, comment out the branch you will modify. # When developing the seed repository, comment out the branch you will modify.
BRANCH_SHA = { BRANCH_SHA = {
'signed-commits' => '6101e87', 'signed-commits' => '6101e87',
...@@ -524,7 +522,7 @@ module TestEnv ...@@ -524,7 +522,7 @@ module TestEnv
def component_matches_git_sha?(component_folder, expected_version) def component_matches_git_sha?(component_folder, expected_version)
# Not a git SHA, so return early # Not a git SHA, so return early
return false unless expected_version =~ SHA_REGEX return false unless expected_version =~ ::Gitlab::Git::COMMIT_ID
sha, exit_status = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} rev-parse HEAD), component_folder) sha, exit_status = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} rev-parse HEAD), component_folder)
return false if exit_status != 0 return false if exit_status != 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment