Commit fe600794 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'auto-deploy-with-space' into 'master'

Rename "autodeploy" to "auto deploy"

Closes #25999

See merge request !8289
parents 5db93437 db8ee667
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
= link_to 'Set up Koding', add_koding_stack_path(@project) = link_to 'Set up Koding', add_koding_stack_path(@project)
- if @repository.gitlab_ci_yml.blank? && @project.deployment_service.present? - if @repository.gitlab_ci_yml.blank? && @project.deployment_service.present?
%li.missing %li.missing
= link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml', commit_message: 'Set up autodeploy', target_branch: 'autodeploy', context: 'autodeploy') do = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml', commit_message: 'Set up auto deploy', target_branch: 'auto-deploy', context: 'autodeploy') do
Set up autodeploy Set up auto deploy
- if @repository.commit - if @repository.commit
.project-last-commit{ class: container_class } .project-last-commit{ class: container_class }
......
---
title: Rename "autodeploy" to "auto deploy"
merge_request:
author:
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
- [CI/CD pipelines settings](../user/project/pipelines/settings.md) - [CI/CD pipelines settings](../user/project/pipelines/settings.md)
- [Review Apps](review_apps/index.md) - [Review Apps](review_apps/index.md)
- [Git submodules](git_submodules.md) Using Git submodules in your CI jobs - [Git submodules](git_submodules.md) Using Git submodules in your CI jobs
- [Autodeploy](autodeploy/index.md) - [Auto deploy](autodeploy/index.md)
## Breaking changes ## Breaking changes
......
# Autodeploy # Auto deploy
> [Introduced][mr-8135] in GitLab 8.15. > [Introduced][mr-8135] in GitLab 8.15.
Autodeploy is an easy way to configure GitLab CI for the deployment of your Auto deploy is an easy way to configure GitLab CI for the deployment of your
application. GitLab Community maintains a list of `.gitlab-ci.yml` application. GitLab Community maintains a list of `.gitlab-ci.yml`
templates for various infrastructure providers and deployment scripts templates for various infrastructure providers and deployment scripts
powering them. These scripts are responsible for packaging your application, powering them. These scripts are responsible for packaging your application,
...@@ -15,7 +15,7 @@ deployment. ...@@ -15,7 +15,7 @@ deployment.
## Supported templates ## Supported templates
The list of supported autodeploy templates is available [here][autodeploy-templates]. The list of supported auto deploy templates is available [here][auto-deploy-templates].
## Configuration ## Configuration
...@@ -24,17 +24,17 @@ credentials. For example, if you want to deploy to OpenShift you have to ...@@ -24,17 +24,17 @@ credentials. For example, if you want to deploy to OpenShift you have to
enable [Kubernetes service][kubernetes-service]. enable [Kubernetes service][kubernetes-service].
1. Configure GitLab Runner to use Docker or Kubernetes executor with 1. Configure GitLab Runner to use Docker or Kubernetes executor with
[privileged mode enabled][docker-in-docker]. [privileged mode enabled][docker-in-docker].
1. Navigate to the "Project" tab and click "Set up autodeploy" button. 1. Navigate to the "Project" tab and click "Set up auto deploy" button.
![Autodeploy button](img/autodeploy_button.png) ![Auto deploy button](img/auto_deploy_button.png)
1. Select a template. 1. Select a template.
![Dropdown with autodeploy templates](img/autodeploy_dropdown.png) ![Dropdown with auto deploy templates](img/auto_deploy_dropdown.png)
1. Commit your changes and create a merge request. 1. Commit your changes and create a merge request.
1. Test your deployment configuration using a [Review App][review-app] that was 1. Test your deployment configuration using a [Review App][review-app] that was
created automatically for you. created automatically for you.
[mr-8135]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8135 [mr-8135]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8135
[project-services]: ../../project_services/project_services.md [project-services]: ../../project_services/project_services.md
[autodeploy-templates]: https://gitlab.com/gitlab-org/gitlab-ci-yml/tree/master/autodeploy [auto-deploy-templates]: https://gitlab.com/gitlab-org/gitlab-ci-yml/tree/master/autodeploy
[kubernetes-service]: ../../project_services/kubernetes.md [kubernetes-service]: ../../project_services/kubernetes.md
[docker-in-docker]: ../docker/using_docker_build.md#use-docker-in-docker-executor [docker-in-docker]: ../docker/using_docker_build.md#use-docker-in-docker-executor
[review-app]: ../review_apps/index.md [review-app]: ../review_apps/index.md
...@@ -15,7 +15,7 @@ module Gitlab ...@@ -15,7 +15,7 @@ module Gitlab
{ {
'General' => '', 'General' => '',
'Pages' => 'Pages', 'Pages' => 'Pages',
'Autodeploy' => 'autodeploy' 'Auto deploy' => 'autodeploy'
} }
end end
...@@ -28,7 +28,7 @@ module Gitlab ...@@ -28,7 +28,7 @@ module Gitlab
end end
def dropdown_names(context) def dropdown_names(context)
categories = context == 'autodeploy' ? ['Autodeploy'] : ['General', 'Pages'] categories = context == 'autodeploy' ? ['Auto deploy'] : ['General', 'Pages']
super().slice(*categories) super().slice(*categories)
end end
end end
......
...@@ -26,7 +26,7 @@ describe 'Auto deploy' do ...@@ -26,7 +26,7 @@ describe 'Auto deploy' do
it 'does not show a button to set up auto deploy' do it 'does not show a button to set up auto deploy' do
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
expect(page).to have_no_content('Set up autodeploy') expect(page).to have_no_content('Set up auto deploy')
end end
end end
...@@ -37,11 +37,11 @@ describe 'Auto deploy' do ...@@ -37,11 +37,11 @@ describe 'Auto deploy' do
end end
it 'shows a button to set up auto deploy' do it 'shows a button to set up auto deploy' do
expect(page).to have_link('Set up autodeploy') expect(page).to have_link('Set up auto deploy')
end end
it 'includes Kubernetes as an available template', js: true do it 'includes OpenShift as an available template', js: true do
click_link 'Set up autodeploy' click_link 'Set up auto deploy'
click_button 'Choose a GitLab CI Yaml template' click_button 'Choose a GitLab CI Yaml template'
within '.gitlab-ci-yml-selector' do within '.gitlab-ci-yml-selector' do
...@@ -49,8 +49,8 @@ describe 'Auto deploy' do ...@@ -49,8 +49,8 @@ describe 'Auto deploy' do
end end
end end
it 'creates a merge request using "autodeploy" branch', js: true do it 'creates a merge request using "auto-deploy" branch', js: true do
click_link 'Set up autodeploy' click_link 'Set up auto deploy'
click_button 'Choose a GitLab CI Yaml template' click_button 'Choose a GitLab CI Yaml template'
within '.gitlab-ci-yml-selector' do within '.gitlab-ci-yml-selector' do
click_on 'OpenShift' click_on 'OpenShift'
...@@ -58,7 +58,7 @@ describe 'Auto deploy' do ...@@ -58,7 +58,7 @@ describe 'Auto deploy' do
wait_for_ajax wait_for_ajax
click_button 'Commit Changes' click_button 'Commit Changes'
expect(page).to have_content('New Merge Request From autodeploy into master') expect(page).to have_content('New Merge Request From auto-deploy into master')
end end
end end
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