lib/gitlab/qa/release.rb in gitlab-qa-8.13.1 vs lib/gitlab/qa/release.rb in gitlab-qa-8.14.0

@@ -5,22 +5,22 @@
 module Gitlab
   module QA
     class Release
       CANONICAL_REGEX = /
         \A
-          (?<edition>ce|ee)
+          (?<edition>ce|ee|jh)
           (-qa)?
           (:(?<tag>.+))?
         \z
       /xi.freeze
       CUSTOM_GITLAB_IMAGE_REGEX = %r{
         \A
           (?<image_without_tag>
             (?<registry>[^/:]+(:(?<port>\d+))?)
             (?<project>.+)
             gitlab-
-            (?<edition>ce|ee)
+            (?<edition>ce|ee|jh)
           )
           (-qa)?
           (:(?<tag>.+))?
         \z
       }xi.freeze
@@ -35,11 +35,11 @@
       #   |             |
       #   |          edition
       # version
       DEV_OFFICIAL_TAG_REGEX = /
         \A
-          (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee)
+          (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee|jh)
         \z
       /xi.freeze
 
       # Dev tag example:
       #  12.1.201906121026-325a6632895.b340d0bd35d
@@ -55,11 +55,11 @@
         \z
       /xi.freeze
 
       DEFAULT_TAG = 'latest'
       DEFAULT_CANONICAL_TAG = 'nightly'
-      DEV_REGISTRY = 'dev.gitlab.org:5005'
-      COM_REGISTRY = 'registry.gitlab.com'
+      DEV_REGISTRY = Gitlab::QA::Runtime::Env.qa_dev_registry
+      COM_REGISTRY = Gitlab::QA::Runtime::Env.qa_com_registry
 
       InvalidImageNameError = Class.new(RuntimeError)
 
       attr_reader :release
       attr_writer :tag