Merge branch 'release-tools/update-gitaly' into 'master'

Update Gitaly version

See merge request gitlab-org/gitlab!46857

app/assets/javascripts/admin/dev_ops_report/devops_adoption.js

-import Vue from 'vue';
-import DevopsAdoptionApp from './components/devops_adoption_app.vue';
-
-export default () => {
-  const el = document.querySelector('.js-devops-adoption');
-
-  if (!el) return false;
-
-  const { emptyStateSvgPath } = el.dataset;
-
-  return new Vue({
-    el,
-    provide: {
-      emptyStateSvgPath,
-    },
-    render(h) {
-      return h(DevopsAdoptionApp);
-    },
-  });
-};
+// EE-specific feature. Find the implementation in the `ee/`-folder
+export default () => {};

app/assets/javascripts/pages/admin/dev_ops_report/index.js

+import initDevopAdoption from 'ee_else_ce/admin/dev_ops_report/devops_adoption';
 import initDevOpsScoreEmptyState from '~/admin/dev_ops_report/devops_score_empty_state';
-import initDevopAdoption from '~/admin/dev_ops_report/devops_adoption';
 
 initDevOpsScoreEmptyState();
 initDevopAdoption();

app/views/admin/dev_ops_report/show.html.haml

@@ -4,17 +4,7 @@
 .container
   .gl-mt-3
     - if Feature.enabled?(:devops_adoption)
-      %h2
-        = _('DevOps Report')
-      %ul.nav-links.nav-tabs.nav.js-devops-tabs{ role: 'tablist' }
-        = render 'tab', active: true, title: _('DevOps Score'), target: '#devops_score_pane'
-        = render 'tab', active: false, title: _('Adoption'), target: '#devops_adoption_pane'
-
-      .tab-content
-        .tab-pane.active#devops_score_pane
-          = render 'report'
-        .tab-pane#devops_adoption_pane
-          .js-devops-adoption{ data: { empty_state_svg_path: image_path('illustrations/monitoring/getting_started.svg') } }
+      = render_if_exists 'admin/dev_ops_report/devops_tabs'
     - else
       = render 'report'
 

changelogs/unreleased/216008-ec2-for-auto-deploy.yml

+---
+title: Add EC2 to AutoDevOps template
+merge_request: 45651
+author:
+type: changed

doc/ci/cloud_deployment/index.md

@@ -282,6 +282,32 @@ When running your project pipeline at this point:
   on the related JSON object's content. The deployment job finishes whenever the deployment to EC2
   is done or has failed.
 
+#### Custom build job for Auto DevOps
+
+To leverage [Auto DevOps](../../topics/autodevops/index.md) for your project when deploying to
+AWS EC2, you must specify a job for the `build` stage.
+
+To do so, you must reference the `Auto-DevOps.gitlab-ci.yml` template and include a job named
+`build_artifact` in your `.gitlab-ci.yml` file. For example:
+
+```yaml
+# .gitlab-ci.yml
+
+include:
+  - template: Auto-DevOps.gitlab-ci.yml
+
+variables:
+  - AUTO_DEVOPS_PLATFORM_TARGET: EC2
+
+build_artifact:
+  stage: build
+  script:
+    - <your build script goes here>
+  artifacts:
+    paths:
+      - <built artifact>
+```
+
 ### Deploy to Amazon EKS 
 
 - [How to deploy your application to a GitLab-managed Amazon EKS cluster with Auto DevOps](https://about.gitlab.com/blog/2020/05/05/deploying-application-eks/)

doc/development/README.md

@@ -133,6 +133,7 @@ from:
 - [Approval Rules](approval_rules.md)
 - [Feature categorization](feature_categorization/index.md)
 - [Wikis development guide](wikis.md)
+- [Newlines style guide](newlines_styleguide.md)
 
 ## Performance guides
 

ee/app/assets/javascripts/admin/dev_ops_report/devops_adoption.js

+import Vue from 'vue';
+import DevopsAdoptionApp from './components/devops_adoption_app.vue';
+
+export default () => {
+  const el = document.querySelector('.js-devops-adoption');
+
+  if (!el) return false;
+
+  const { emptyStateSvgPath } = el.dataset;
+
+  return new Vue({
+    el,
+    provide: {
+      emptyStateSvgPath,
+    },
+    render(h) {
+      return h(DevopsAdoptionApp);
+    },
+  });
+};

ee/app/views/admin/dev_ops_report/_devops_tabs.html.haml

+%h2
+  = _('DevOps Report')
+%ul.nav-links.nav-tabs.nav.js-devops-tabs{ role: 'tablist' }
+  = render 'tab', active: true, title: _('DevOps Score'), target: '#devops_score_pane'
+  = render 'tab', active: false, title: _('Adoption'), target: '#devops_adoption_pane'
+
+.tab-content
+  .tab-pane.active#devops_score_pane
+    = render_ce 'admin/dev_ops_report/report'
+  .tab-pane#devops_adoption_pane
+    .js-devops-adoption{ data: { empty_state_svg_path: image_path('illustrations/monitoring/getting_started.svg') } }

ee/spec/features/admin/admin_dev_ops_report_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'DevOps Report page', :js do
+  tabs_selector = '.js-devops-tabs'
+  tab_item_selector = '.js-devops-tab-item'
+  active_tab_selector = '.nav-link.active'
+
+  before do
+    sign_in(create(:admin))
+  end
+
+  context 'with devops_adoption feature flag disabled' do
+    before do
+      stub_feature_flags(devops_adoption: false)
+    end
+
+    it 'does not show the tabbed layout' do
+      visit admin_dev_ops_report_path
+
+      expect(page).not_to have_selector tabs_selector
+    end
+  end
+
+  context 'with devops_adoption feature flag enabled' do
+    it 'shows the tabbed layout' do
+      visit admin_dev_ops_report_path
+
+      expect(page).to have_selector tabs_selector
+    end
+
+    it 'shows the correct tabs' do
+      visit admin_dev_ops_report_path
+
+      within tabs_selector do
+        expect(page.all(:css, tab_item_selector).length).to be(2)
+        expect(page).to have_text 'DevOps Score Adoption'
+      end
+    end
+
+    it 'defaults to the DevOps Score tab' do
+      visit admin_dev_ops_report_path
+
+      within tabs_selector do
+        expect(page).to have_selector active_tab_selector, text: 'DevOps Score'
+      end
+    end
+
+    it 'displays the Adoption tab content when selected' do
+      visit admin_dev_ops_report_path
+
+      click_link 'Adoption'
+
+      within tabs_selector do
+        expect(page).to have_selector active_tab_selector, text: 'Adoption'
+      end
+    end
+
+    context 'the devops score tab' do
+      it 'has dismissable intro callout' do
+        visit admin_dev_ops_report_path
+
+        expect(page).to have_content 'Introducing Your DevOps Report'
+
+        find('.js-close-callout').click
+
+        expect(page).not_to have_content 'Introducing Your DevOps Report'
+      end
+
+      context 'when usage ping is disabled' do
+        before do
+          stub_application_setting(usage_ping_enabled: false)
+        end
+
+        it 'shows empty state' do
+          visit admin_dev_ops_report_path
+
+          expect(page).to have_selector(".js-empty-state")
+        end
+
+        it 'hides the intro callout' do
+          visit admin_dev_ops_report_path
+
+          expect(page).not_to have_content 'Introducing Your DevOps Report'
+        end
+      end
+
+      context 'when there is no data to display' do
+        it 'shows empty state' do
+          stub_application_setting(usage_ping_enabled: true)
+
+          visit admin_dev_ops_report_path
+
+          expect(page).to have_content('Data is still calculating')
+        end
+      end
+
+      context 'when there is data to display' do
+        it 'shows numbers for each metric' do
+          stub_application_setting(usage_ping_enabled: true)
+          create(:dev_ops_report_metric)
+
+          visit admin_dev_ops_report_path
+
+          expect(page).to have_content(
+            'Issues created per active user 1.2 You 9.3 Lead 13.3%'
+          )
+        end
+      end
+    end
+  end
+end

spec/frontend/admin/dev_ops_report/components/devops_adoption_app_spec.js → ee/spec/frontend/admin/dev_ops_report/components/devops_adoption_app_spec.js

 import { shallowMount } from '@vue/test-utils';
-import DevopsAdoptionApp from '~/admin/dev_ops_report/components/devops_adoption_app.vue';
-import DevopsAdoptionEmptyState from '~/admin/dev_ops_report/components/devops_adoption_empty_state.vue';
+import DevopsAdoptionApp from 'ee/admin/dev_ops_report/components/devops_adoption_app.vue';
+import DevopsAdoptionEmptyState from 'ee/admin/dev_ops_report/components/devops_adoption_empty_state.vue';
 
 describe('DevopsAdoptionApp', () => {
   let wrapper;

spec/frontend/admin/dev_ops_report/components/devops_adoption_empty_state_spec.js → ee/spec/frontend/admin/dev_ops_report/components/devops_adoption_empty_state_spec.js

 import { shallowMount } from '@vue/test-utils';
 import { GlEmptyState, GlButton } from '@gitlab/ui';
-import DevopsAdoptionEmptyState from '~/admin/dev_ops_report/components/devops_adoption_empty_state.vue';
-import { DEVOPS_ADOPTION_STRINGS } from '~/admin/dev_ops_report/constants';
+import DevopsAdoptionEmptyState from 'ee/admin/dev_ops_report/components/devops_adoption_empty_state.vue';
+import { DEVOPS_ADOPTION_STRINGS } from 'ee/admin/dev_ops_report/constants';
 
 const emptyStateSvgPath = 'illustrations/monitoring/getting_started.svg';
 

lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml

@@ -163,6 +163,7 @@ include:
   - template: Jobs/Code-Intelligence.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Jobs/Code-Intelligence.gitlab-ci.yml
   - template: Jobs/Deploy.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
   - template: Jobs/Deploy/ECS.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Jobs/Deploy/ECS.gitlab-ci.yml
+  - template: Jobs/Deploy/EC2.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Jobs/Deploy/EC2.gitlab-ci.yml
   - template: Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
   - template: Jobs/Browser-Performance-Testing.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml
   - template: Security/DAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml

lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml

@@ -16,4 +16,14 @@ build:
       fi
     - /build/build.sh
   rules:
+    - if: '$AUTO_DEVOPS_PLATFORM_TARGET == "EC2"'
+      when: never
     - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH'
+
+build_artifact:
+  stage: build
+  script:
+    - printf "To build your project, please create a build_artifact job into your .gitlab-ci.yml file.\nMore information at https://docs.gitlab.com/ee/ci/cloud_deployment\n"
+    - exit 1
+  rules:
+    - if: '$AUTO_DEVOPS_PLATFORM_TARGET == "EC2"'

spec/features/admin/admin_dev_ops_report_spec.rb

@@ -3,10 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe 'DevOps Report page', :js do
-  tabs_selector = '.js-devops-tabs'
-  tab_item_selector = '.js-devops-tab-item'
-  active_tab_selector = '.nav-link.active'
-
   before do
     sign_in(create(:admin))
   end
@@ -16,12 +12,6 @@ RSpec.describe 'DevOps Report page', :js do
       stub_feature_flags(devops_adoption: false)
     end
 
-    it 'does not show the tabbed layout' do
-      visit admin_dev_ops_report_path
-
-      expect(page).not_to have_selector tabs_selector
-    end
-
     it 'has dismissable intro callout' do
       visit admin_dev_ops_report_path
 
@@ -73,92 +63,4 @@ RSpec.describe 'DevOps Report page', :js do
       end
     end
   end
-
-  context 'with devops_adoption feature flag enabled' do
-    it 'shows the tabbed layout' do
-      visit admin_dev_ops_report_path
-
-      expect(page).to have_selector tabs_selector
-    end
-
-    it 'shows the correct tabs' do
-      visit admin_dev_ops_report_path
-
-      within tabs_selector do
-        expect(page.all(:css, tab_item_selector).length).to be(2)
-        expect(page).to have_text 'DevOps Score Adoption'
-      end
-    end
-
-    it 'defaults to the DevOps Score tab' do
-      visit admin_dev_ops_report_path
-
-      within tabs_selector do
-        expect(page).to have_selector active_tab_selector, text: 'DevOps Score'
-      end
-    end
-
-    it 'displays the Adoption tab content when selected' do
-      visit admin_dev_ops_report_path
-
-      click_link 'Adoption'
-
-      within tabs_selector do
-        expect(page).to have_selector active_tab_selector, text: 'Adoption'
-      end
-    end
-
-    context 'the devops score tab' do
-      it 'has dismissable intro callout' do
-        visit admin_dev_ops_report_path
-
-        expect(page).to have_content 'Introducing Your DevOps Report'
-
-        find('.js-close-callout').click
-
-        expect(page).not_to have_content 'Introducing Your DevOps Report'
-      end
-
-      context 'when usage ping is disabled' do
-        before do
-          stub_application_setting(usage_ping_enabled: false)
-        end
-
-        it 'shows empty state' do
-          visit admin_dev_ops_report_path
-
-          expect(page).to have_selector(".js-empty-state")
-        end
-
-        it 'hides the intro callout' do
-          visit admin_dev_ops_report_path
-
-          expect(page).not_to have_content 'Introducing Your DevOps Report'
-        end
-      end
-
-      context 'when there is no data to display' do
-        it 'shows empty state' do
-          stub_application_setting(usage_ping_enabled: true)
-
-          visit admin_dev_ops_report_path
-
-          expect(page).to have_content('Data is still calculating')
-        end
-      end
-
-      context 'when there is data to display' do
-        it 'shows numbers for each metric' do
-          stub_application_setting(usage_ping_enabled: true)
-          create(:dev_ops_report_metric)
-
-          visit admin_dev_ops_report_path
-
-          expect(page).to have_content(
-            'Issues created per active user 1.2 You 9.3 Lead 13.3%'
-          )
-        end
-      end
-    end
-  end
 end

spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb

@@ -122,6 +122,15 @@ RSpec.describe 'Auto-DevOps.gitlab-ci.yml' do
           end
         end
       end
+
+      context 'when the platform target is EC2' do
+        let(:platform_value) { 'EC2' }
+
+        it 'contains the build_artifact job, not the build job' do
+          expect(build_names).to include('build_artifact')
+          expect(build_names).not_to include('build')
+        end
+      end
     end
 
     context 'when the project has no active cluster' do