Commit c8c711e4 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'qa-update-group-file-template-spec' into 'master'

Disable autodevops in group file template spec

See merge request gitlab-org/gitlab!19708
parents c7916c8b b1c83d2b
...@@ -22,7 +22,13 @@ module QA ...@@ -22,7 +22,13 @@ module QA
type: '.gitlab-ci.yml', type: '.gitlab-ci.yml',
template: 'custom_gitlab-ci', template: 'custom_gitlab-ci',
file_path: 'gitlab-ci/custom_gitlab-ci.yml', file_path: 'gitlab-ci/custom_gitlab-ci.yml',
content: 'gitlab-ci template test' content:
<<~CI
job:
script: echo "Skipped"
except:
- master
CI
}, },
{ {
type: 'LICENSE', type: 'LICENSE',
...@@ -43,12 +49,13 @@ module QA ...@@ -43,12 +49,13 @@ module QA
project.group = @group project.group = @group
project.name = 'group-file-template-project' project.name = 'group-file-template-project'
project.description = 'Add group file templates' project.description = 'Add group file templates'
project.auto_devops_enabled = false
project.initialize_with_readme = true project.initialize_with_readme = true
end end
Resource::Repository::Commit.fabricate_via_api! do |commit| Resource::Repository::Commit.fabricate_via_api! do |commit|
commit.project = @file_template_project commit.project = @file_template_project
commit.commit_message = 'Add CODEOWNERS and test files' commit.commit_message = 'Add group file templates'
commit.add_files(templates) commit.add_files(templates)
end end
...@@ -56,6 +63,7 @@ module QA ...@@ -56,6 +63,7 @@ module QA
project.group = @group project.group = @group
project.name = 'group-file-template-project-2' project.name = 'group-file-template-project-2'
project.description = 'Add files for group file templates' project.description = 'Add files for group file templates'
project.auto_devops_enabled = false
project.initialize_with_readme = true project.initialize_with_readme = true
end end
......
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