Commit dead33c0 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'qa-custom-default-branch-follow-up' into 'master'

Use custom default branch in Protected Branches QA resource

See merge request gitlab-org/gitlab!51934
parents 2d70e44b c3b2206e
...@@ -22,7 +22,7 @@ module QA ...@@ -22,7 +22,7 @@ module QA
Resource::Repository::Commit.fabricate_via_api! do |commit| Resource::Repository::Commit.fabricate_via_api! do |commit|
commit.project = project commit.project = project
commit.branch = branch_name commit.branch = branch_name
commit.start_branch = 'master' commit.start_branch = project.default_branch
commit.commit_message = 'Add new file' commit.commit_message = 'Add new file'
commit.add_files([ commit.add_files([
{ file_path: "new_file-#{SecureRandom.hex(8)}.md", content: 'new file' } { file_path: "new_file-#{SecureRandom.hex(8)}.md", content: 'new file' }
......
...@@ -132,7 +132,7 @@ module QA ...@@ -132,7 +132,7 @@ module QA
- 'mvn deploy -s settings.xml' - 'mvn deploy -s settings.xml'
- "mvn dependency:get -Dartifact=#{group_id}:#{artifact_id}:1.0" - "mvn dependency:get -Dartifact=#{group_id}:#{artifact_id}:1.0"
only: only:
- master - "#{project.default_branch}"
tags: tags:
- "runner-for-#{project.name}" - "runner-for-#{project.name}"
YAML YAML
......
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