Merge branch 'dbg-add-bamboo-bc-to-comp' into 'master'

Add bamboo tols info to comp page. tweak comp page template for better spacing with tool page info.

See merge request gitlab-com/www-gitlab-com!14897

data/features.yml

@@ -148,12 +148,7 @@ competitors:
     category:
       - continuous_integration
       - continuous_delivery
-    summary: |
-      Bamboo Server is a CI/CD solution which is part of the Atlassian suite of developer tools. It is available only in a self-managed configuration and is a closed source solution. Bamboo offers build, test, and deployment automation, and has tight integrations to Atlassian BitBucket (for SCM) and Fisheye (for understanding how source code has changed), as well as integrations to over 150 other tools. In contrast, GitLab offers a git-based SCM, SCM integrations, and code change traceability out of the box in a single application.
-
-      Bamboo offers a GUI for defining build plans, but does not offer pipeline as code. Bamboo also offers deployment plans (which include the notion of environments and releases), pre-deployment visibility, and per-environment deployment permissions. GitLab also offers release tracking across environments and deep visibility into the changes in a deployment, but sets deployment permissions based on branch permissions.
-
-      Bamboo steps can be run in parallel across agents, and those agents can be auto-scaled based on need if Bamboo is configured for a feature called Elastic Bamboo. Elastic Bamboo requires the use of "remote agents", which you pay extra for. Organizations who want auto-scaling are also locked in to using Amazon Elastic Compute Cloud (EC2) and paying Amazon separately for their usage. In contrast, GitLab does not charge per remote agent (runner) and scales with a variety of cloud and container solutions.
+    include_file: devops-tools/bamboo/index.html.md
   spinnaker:
     name: 'Spinnaker'
     logo: '/images/comparison/spinnaker-logo.svg'

source/devops-tools/bamboo/index.html.md

@@ -29,20 +29,21 @@ tact so that others can see where new sections should be added.
 <!------------------Begin page additions below this line ------------------ -->
-## On this page
+<!-- ## On this page
 {:.no_toc}
+-->
 - TOC
 {:toc}
-### Summary
-Bamboo Server is a CI/CD solution which is part of the Atlassian suite of developer tools. It is available only in a self-managed configuration and is a closed source solution. Bamboo offers build, test, and deployment automation, and has tight integrations to Atlassian BitBucket (for SCM) and Fisheye (for understanding how source code has changed), as well as integrations to over 150 other tools.
-Bamboo offers a GUI for defining build plans, but does not offer pipeline as code. Bamboo also offers deployment plans (which include the notion of environments and releases), pre-deployment visibility, and per-environment deployment permissions.
-Bamboo steps can be run in parallel across agents, and those agents can be auto-scaled based on need if Bamboo is configured for a feature called [Elastic Bamboo](https://confluence.atlassian.com/bamboo/configuring-elastic-bamboo-289277120.html). Elastic Bamboo requires the use of "remote agents", which you pay extra for (see [pricing](#pricing) for more details). Organizations who want auto-scaling are also locked in to using Amazon Elastic Compute Cloud (EC2) and paying Amazon separately for their usage.
-### Comments/Anecdotes
+## Summary
+Bamboo Server is a CI/CD solution which is part of the Atlassian suite of developer tools. It is available only in a self-managed configuration and is a closed source solution. Bamboo offers build, test, and deployment automation, and has tight integrations to Atlassian BitBucket (for SCM) and Fisheye (for understanding how source code has changed), as well as integrations to over 150 other tools. In contrast, GitLab offers a git-based SCM, SCM integrations, and code change traceability out of the box in a single application.
+Bamboo offers a GUI for defining build plans, but does not offer pipeline as code. Bamboo also offers deployment plans (which include the notion of environments and releases), pre-deployment visibility, and per-environment deployment permissions. GitLab also offers release tracking across environments and deep visibility into the changes in a deployment, but sets deployment permissions based on branch permissions.
+Bamboo steps can be run in parallel across agents, and those agents can be auto-scaled based on need if Bamboo is configured for a feature called Elastic Bamboo. [Elastic Bamboo](https://confluence.atlassian.com/bamboo/configuring-elastic-bamboo-289277120.html) requires the use of "remote agents", which you pay extra for (see [pricing](#pricing)). Organizations who want auto-scaling are also locked in to using Amazon Elastic Compute Cloud (EC2) and paying Amazon separately for their usage. In contrast, GitLab does not charge per remote agent (runner) and scales with a variety of cloud and container solutions.
+## Comments/Anecdotes
 - Sales heard from large networking company
    > "Terrible!, All UI Based, Cannot configure 'as code' (ala .gitlab-ci.yml)"
@@ -74,10 +75,10 @@ Bamboo steps can be run in parallel across agents, and those agents can be auto-
      - **Key text:** "Bamboo requires separate Git authentication for submodules. This involves either using HTTPS for submodules and providing the credentials through the job's environment variables, or configuring separate SSH keys on each build agent. Using HTTPS would render local builds unusable, requiring credentials every time. Adding SSH keys to every Bamboo agent is unmaintainable. . . . This reason, among others is a large part of why we have migrated away from Bamboo. We now use Gitlab and Gitlab CI for much better Docker and git support."
      - **Link:** [Bamboo Issue in Jira](https://jira.atlassian.com/browse/BAM-11369?focusedCommentId=1588832&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-1588832)
-### Resources
+## Resources
 * [Atlassian Bamboo Website](https://www.atlassian.com/software/bamboo)
-### Pricing
+## Pricing
 - [Price page](https://www.atlassian.com/software/bamboo/pricing)
 - [Bamboo Pricing Guide](https://www.atlassian.com/licensing/bamboo#serverlicenses-3)  
    (includes price additions for remote agents, and academic pricing)
@@ -87,5 +88,4 @@ Bamboo steps can be run in parallel across agents, and those agents can be auto-
    (see Bamboo Pricing Guide for prices)
 - First purchase includes perpetual software and 1 yr maintenance. Yearly cost for maintenance is approximately 50% of initial remote agent tier cost. (e.g. 1st year @25 remote agents = $8,800, second year maintenance = $4,400)
-### Comparison
-- [Compare features to GitLab](https://about.gitlab.com/comparison/bamboo-vs-gitlab-ultimate.html)
+## Comparison

source/templates/comparison.html.haml

@@ -20,14 +20,14 @@ extra_js:
 %h1.titles-comparison-companies.text-center
   = product_one.name + " vs GitLab"
-.container
-  .row
-    .col-md-10.col-md-offset-1
-      - if product_one.summary.present?
-        = kramdown(product_one.summary)
-      - if product_one.include_file.present?
-        = partial product_one.include_file
-      %br
+
+.row
+  - if product_one.summary.present?
+    .col-md-10.col-md-offset-1.margin-bottom30
+      = kramdown(product_one.summary)
+  - if product_one.include_file.present?
+    .col-md-10
+      = partial product_one.include_file
 %table.compare-table.comparing-gitlab
   %colgroup