Merge branch 'jts/adjust-auto-deploy-schema' into 'master'

Adjust the auto-deploy schema to be utilized by CNG

See merge request gitlab-org/build/CNG!394

.gitlab-ci.yml

@@ -3,7 +3,7 @@ include: ci_files/variables.yml
 variables:
   # Format of the auto-deploy tag for auto-deploy builds.
   # https://gitlab.com/gitlab-org/release/docs/blob/master/general/deploy/auto-deploy.md#auto-deploy-tagging
-  AUTO_DEPLOY_TAG_REGEX: '^[0-9]+\.[0-9]+\.[0-9]+\+[a-z0-9]{7,}\.[a-z0-9]{7,}$'
+  AUTO_DEPLOY_TAG_REGEX: '^[0-9]+\.[0-9]+\.[0-9]+\+[a-z0-9]{7,}$'
 
 stages:
   - prepare
@@ -46,7 +46,7 @@ stages:
       - $DEPS_PIPELINE
       # Format of the auto-deploy tag for auto-deploy builds.
       # https://gitlab.com/gitlab-org/release/docs/blob/master/general/deploy/auto-deploy.md#auto-deploy-tagging
-      - $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+\+[a-z0-9]{7,}\.[a-z0-9]{7,}$/
+      - $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+\+[a-z0-9]{7,}$/
 
 .job-base: &job-base
   image: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder:ruby_docker-0.0.7"