Merge branch 'auto-deploy-with-space' into 'master'
Rename "autodeploy" to "auto deploy" Closes #25999 See merge request !8289
This commit is contained in:
commit
fe60079454
10 changed files with 23 additions and 19 deletions
|
@ -70,8 +70,8 @@
|
|||
= link_to 'Set up Koding', add_koding_stack_path(@project)
|
||||
- if @repository.gitlab_ci_yml.blank? && @project.deployment_service.present?
|
||||
%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
|
||||
Set up autodeploy
|
||||
= 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 auto deploy
|
||||
|
||||
- if @repository.commit
|
||||
.project-last-commit{ class: container_class }
|
||||
|
|
4
changelogs/unreleased/auto-deploy-with-space.yml
Normal file
4
changelogs/unreleased/auto-deploy-with-space.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Rename "autodeploy" to "auto deploy"
|
||||
merge_request:
|
||||
author:
|
|
@ -23,7 +23,7 @@
|
|||
- [CI/CD pipelines settings](../user/project/pipelines/settings.md)
|
||||
- [Review Apps](review_apps/index.md)
|
||||
- [Git submodules](git_submodules.md) Using Git submodules in your CI jobs
|
||||
- [Autodeploy](autodeploy/index.md)
|
||||
- [Auto deploy](autodeploy/index.md)
|
||||
|
||||
## Breaking changes
|
||||
|
||||
|
|
BIN
doc/ci/autodeploy/img/auto_deploy_button.png
Normal file
BIN
doc/ci/autodeploy/img/auto_deploy_button.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 42 KiB |
BIN
doc/ci/autodeploy/img/auto_deploy_dropdown.png
Normal file
BIN
doc/ci/autodeploy/img/auto_deploy_dropdown.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 43 KiB |
Binary file not shown.
Before Width: | Height: | Size: 41 KiB |
Binary file not shown.
Before Width: | Height: | Size: 50 KiB |
|
@ -1,8 +1,8 @@
|
|||
# Autodeploy
|
||||
# Auto deploy
|
||||
|
||||
> [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`
|
||||
templates for various infrastructure providers and deployment scripts
|
||||
powering them. These scripts are responsible for packaging your application,
|
||||
|
@ -15,7 +15,7 @@ deployment.
|
|||
|
||||
## 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
|
||||
|
||||
|
@ -24,17 +24,17 @@ credentials. For example, if you want to deploy to OpenShift you have to
|
|||
enable [Kubernetes service][kubernetes-service].
|
||||
1. Configure GitLab Runner to use Docker or Kubernetes executor with
|
||||
[privileged mode enabled][docker-in-docker].
|
||||
1. Navigate to the "Project" tab and click "Set up autodeploy" button.
|
||||
![Autodeploy button](img/autodeploy_button.png)
|
||||
1. Navigate to the "Project" tab and click "Set up auto deploy" button.
|
||||
![Auto deploy button](img/auto_deploy_button.png)
|
||||
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. Test your deployment configuration using a [Review App][review-app] that was
|
||||
created automatically for you.
|
||||
|
||||
[mr-8135]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8135
|
||||
[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
|
||||
[docker-in-docker]: ../docker/using_docker_build.md#use-docker-in-docker-executor
|
||||
[review-app]: ../review_apps/index.md
|
||||
|
|
|
@ -15,7 +15,7 @@ module Gitlab
|
|||
{
|
||||
'General' => '',
|
||||
'Pages' => 'Pages',
|
||||
'Autodeploy' => 'autodeploy'
|
||||
'Auto deploy' => 'autodeploy'
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -28,7 +28,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def dropdown_names(context)
|
||||
categories = context == 'autodeploy' ? ['Autodeploy'] : ['General', 'Pages']
|
||||
categories = context == 'autodeploy' ? ['Auto deploy'] : ['General', 'Pages']
|
||||
super().slice(*categories)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -26,7 +26,7 @@ describe 'Auto deploy' do
|
|||
|
||||
it 'does not show a button to set up auto deploy' do
|
||||
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
|
||||
|
||||
|
@ -37,11 +37,11 @@ describe 'Auto deploy' do
|
|||
end
|
||||
|
||||
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
|
||||
|
||||
it 'includes Kubernetes as an available template', js: true do
|
||||
click_link 'Set up autodeploy'
|
||||
it 'includes OpenShift as an available template', js: true do
|
||||
click_link 'Set up auto deploy'
|
||||
click_button 'Choose a GitLab CI Yaml template'
|
||||
|
||||
within '.gitlab-ci-yml-selector' do
|
||||
|
@ -49,8 +49,8 @@ describe 'Auto deploy' do
|
|||
end
|
||||
end
|
||||
|
||||
it 'creates a merge request using "autodeploy" branch', js: true do
|
||||
click_link 'Set up autodeploy'
|
||||
it 'creates a merge request using "auto-deploy" branch', js: true do
|
||||
click_link 'Set up auto deploy'
|
||||
click_button 'Choose a GitLab CI Yaml template'
|
||||
within '.gitlab-ci-yml-selector' do
|
||||
click_on 'OpenShift'
|
||||
|
@ -58,7 +58,7 @@ describe 'Auto deploy' do
|
|||
wait_for_ajax
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue