Merge branch 'ui-text-bamboo-ci' into 'master'

Update bamboo CI service UI text

See merge request gitlab-org/gitlab!58392

app/models/project_services/bamboo_service.rb

 # frozen_string_literal: true
 
 class BambooService < CiService
+  include ActionView::Helpers::UrlHelper
   include ReactiveService
 
   prop_accessor :bamboo_url, :build_key, :username, :password
@@ -31,15 +32,16 @@ class BambooService < CiService
   end
 
   def title
-    s_('BambooService|Atlassian Bamboo CI')
+    s_('BambooService|Atlassian Bamboo')
   end
 
   def description
-    s_('BambooService|A continuous integration and build server')
+    s_('BambooService|Use the Atlassian Bamboo CI/CD server with GitLab.')
   end
 
   def help
-    s_('BambooService|You must set up automatic revision labeling and a repository trigger in Bamboo.')
+    docs_link = link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/bamboo'), target: '_blank', rel: 'noopener noreferrer'
+    s_('BambooService|Use Atlassian Bamboo to run CI/CD pipelines. You must set up automatic revision labeling and a repository trigger in Bamboo. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
   end
 
   def self.to_param
@@ -52,19 +54,21 @@ class BambooService < CiService
           type: 'text',
           name: 'bamboo_url',
           title: s_('BambooService|Bamboo URL'),
-          placeholder: s_('BambooService|Bamboo root URL like https://bamboo.example.com'),
+          placeholder: s_('https://bamboo.example.com'),
+          help: s_('BambooService|Bamboo service root URL.'),
           required: true
         },
         {
           type: 'text',
           name: 'build_key',
-          placeholder: s_('BambooService|Bamboo build plan key like KEY'),
+          placeholder: s_('KEY'),
+          help: s_('BambooService|Bamboo build plan key.'),
           required: true
         },
         {
           type: 'text',
           name: 'username',
-          placeholder: s_('BambooService|A user with API access, if applicable')
+          help: s_('BambooService|The user with API access to the Bamboo server.')
         },
         {
           type: 'password',

changelogs/unreleased/ui-text-bamboo-ci.yml

+---
+title: Update pot file
+merge_request: 58392
+author:
+type: other

doc/user/project/integrations/bamboo.md

@@ -4,11 +4,11 @@ group: Ecosystem
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Atlassian Bamboo CI Service **(FREE)**
+# Atlassian Bamboo Service **(FREE)**
 
 GitLab provides integration with Atlassian Bamboo for continuous integration.
 When configured, pushes to a project trigger a build in Bamboo automatically.
-Merge requests also display CI status showing whether the build is pending,
+Merge requests also display CI/CD status showing whether the build is pending,
 failed, or completed successfully. It also provides a link to the Bamboo build
 page for more information.
 
@@ -20,21 +20,21 @@ need to be configured in a Bamboo build plan before GitLab can integrate.
 
 ### Complete these steps in Bamboo
 
-1. Navigate to a Bamboo build plan and choose 'Configure plan' from the 'Actions'
+1. Navigate to a Bamboo build plan and choose **Configure plan** from the **Actions**
    dropdown.
-1. Select the 'Triggers' tab.
-1. Click 'Add trigger'.
-1. Enter a description such as 'GitLab trigger'
-1. Choose 'Repository triggers the build when changes are committed'
-1. Check one or more repositories checkboxes
-1. Enter the GitLab IP address in the 'Trigger IP addresses' box. This is a
+1. Select the **Triggers** tab.
+1. Click **Add trigger**.
+1. Enter a description such as **GitLab trigger**.
+1. Choose **Repository triggers the build when changes are committed**.
+1. Select the checkbox for one or more repositories.
+1. Enter the GitLab IP address in the **Trigger IP addresses** box. This is a
    list of IP addresses that are allowed to trigger Bamboo builds.
 1. Save the trigger.
 1. In the left pane, select a build stage. If you have multiple build stages
    you want to select the last stage that contains the Git checkout task.
-1. Select the 'Miscellaneous' tab.
-1. Under 'Pattern Match Labeling' put `${bamboo.repository.revision.number}`
-   in the 'Labels' box.
+1. Select the **Miscellaneous** tab.
+1. Under **Pattern Match Labeling** put `${bamboo.repository.revision.number}`
+   in the **Labels** box.
 1. Save
 
 Bamboo is now ready to accept triggers from GitLab. Next, set up the Bamboo
@@ -44,18 +44,18 @@ service in GitLab.
 
 1. Navigate to the project you want to configure to trigger builds.
 1. Navigate to the [Integrations page](overview.md#accessing-integrations)
-1. Click 'Atlassian Bamboo CI'
+1. Click **Atlassian Bamboo**.
 1. Ensure that the **Active** toggle is enabled.
 1. Enter the base URL of your Bamboo server. `https://bamboo.example.com`
 1. Enter the build key from your Bamboo build plan. Build keys are typically made
    up from the Project Key and Plan Key that are set on project/plan creation and
-   separated with a dash (`-`), for example  **PROJ-PLAN**. This is a short, all
+   separated with a dash (`-`), for example **PROJ-PLAN**. This is a short, all
    uppercase identifier that is unique. When viewing a plan in Bamboo, the
    build key is also shown in the browser URL, for example `https://bamboo.example.com/browse/PROJ-PLAN`.
 1. If necessary, enter username and password for a Bamboo user that has
    access to trigger the build plan. Leave these fields blank if you do not require
    authentication.
-1. Save or optionally click 'Test Settings'. Please note that 'Test Settings'
+1. Save or optionally click **Test Settings**. Please note that **Test Settings**
    actually triggers a build in Bamboo.
 
 ## Troubleshooting
@@ -63,7 +63,7 @@ service in GitLab.
 ### Builds not triggered
 
 If builds are not triggered, ensure you entered the right GitLab IP address in
-Bamboo under 'Trigger IP addresses'. Also check [service hook logs](overview.md#troubleshooting-integrations) for request failures.
+Bamboo under **Trigger IP addresses**. Also check [service hook logs](overview.md#troubleshooting-integrations) for request failures.
 
 ### Advanced Atlassian Bamboo features not available in GitLab UI
 

locale/gitlab.pot

@@ -4714,25 +4714,25 @@ msgstr ""
 msgid "Balsamiq file could not be loaded."
 msgstr ""
 
-msgid "BambooService|A continuous integration and build server"
+msgid "BambooService|Atlassian Bamboo"
 msgstr ""
 
-msgid "BambooService|A user with API access, if applicable"
+msgid "BambooService|Bamboo URL"
 msgstr ""
 
-msgid "BambooService|Atlassian Bamboo CI"
+msgid "BambooService|Bamboo build plan key."
 msgstr ""
 
-msgid "BambooService|Bamboo URL"
+msgid "BambooService|Bamboo service root URL."
 msgstr ""
 
-msgid "BambooService|Bamboo build plan key like KEY"
+msgid "BambooService|The user with API access to the Bamboo server."
 msgstr ""
 
-msgid "BambooService|Bamboo root URL like https://bamboo.example.com"
+msgid "BambooService|Use Atlassian Bamboo to run CI/CD pipelines. You must set up automatic revision labeling and a repository trigger in Bamboo. %{docs_link}"
 msgstr ""
 
-msgid "BambooService|You must set up automatic revision labeling and a repository trigger in Bamboo."
+msgid "BambooService|Use the Atlassian Bamboo CI/CD server with GitLab."
 msgstr ""
 
 msgid "Based on"
@@ -17849,6 +17849,9 @@ msgstr ""
 msgid "K8s pod health"
 msgstr ""
 
+msgid "KEY"
+msgstr ""
+
 msgid "Keep artifacts from most recent successful jobs"
 msgstr ""
 
@@ -36284,6 +36287,9 @@ msgstr ""
 msgid "http://www.example.com"
 msgstr ""
 
+msgid "https://bamboo.example.com"
+msgstr ""
+
 msgid "https://your-bitbucket-server"
 msgstr ""
 

spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe 'User activates Atlassian Bamboo CI' do
   end
 
   it 'activates service', :js do
-    visit_project_integration('Atlassian Bamboo CI')
+    visit_project_integration('Atlassian Bamboo')
     fill_in('Bamboo URL', with: 'http://bamboo.example.com')
     fill_in('Build key', with: 'KEY')
     fill_in('Username', with: 'user')
@@ -18,10 +18,10 @@ RSpec.describe 'User activates Atlassian Bamboo CI' do
 
     click_test_then_save_integration(expect_test_to_fail: false)
 
-    expect(page).to have_content('Atlassian Bamboo CI settings saved and active.')
+    expect(page).to have_content('Atlassian Bamboo settings saved and active.')
 
     # Password field should not be filled in.
-    click_link('Atlassian Bamboo CI')
+    click_link('Atlassian Bamboo')
 
     expect(find_field('Enter new password').value).to be_blank
     expect(page).to have_content('Leave blank to use your current password')