Commit e8e5f49f authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rs-remove-auto-deploy-from-qa' into 'master'

Exempt auto-deploy from package-and-qa jobs

See merge request gitlab-org/gitlab!17904
parents 9fb74ec5 48b3ec4b
...@@ -19,6 +19,7 @@ package-and-qa-manual: ...@@ -19,6 +19,7 @@ package-and-qa-manual:
except: except:
refs: refs:
- master - master
- /^\d+-\d+-auto-deploy-\d+$/
when: manual when: manual
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
...@@ -29,6 +30,7 @@ package-and-qa: ...@@ -29,6 +30,7 @@ package-and-qa:
except: except:
refs: refs:
- master - master
- /^\d+-\d+-auto-deploy-\d+$/
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"] needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
allow_failure: true allow_failure: true
......
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