Merge branch 'merge-auto-devops-beta-template-into-main' into 'master'

Merge Auto DevOps beta template into the main template

See merge request gitlab-org/gitlab!28242

changelogs/unreleased/merge-auto-devops-beta-template-into-main.yml

+---
+title: Add file-based pipeline conditions to default Auto DevOps CI template
+merge_request: 28242
+author:
+type: changed

lib/gitlab/ci/pipeline/chain/config/content/auto_devops.rb

@@ -23,15 +23,7 @@ module Gitlab
               private
 
               def template_name
-                if beta_enabled?
-                  'Beta/Auto-DevOps'
-                else
-                  'Auto-DevOps'
-                end
-              end
-
-              def beta_enabled?
-                Feature.enabled?(:auto_devops_beta, project, default_enabled: true)
+                'Auto-DevOps'
               end
             end
           end

lib/gitlab/ci/pipeline/chain/config/content/legacy_auto_devops.rb

@@ -23,15 +23,7 @@ module Gitlab
               private
 
               def template_name
-                if beta_enabled?
-                  'Beta/Auto-DevOps'
-                else
-                  'Auto-DevOps'
-                end
-              end
-
-              def beta_enabled?
-                Feature.enabled?(:auto_devops_beta, project, default_enabled: true)
+                'Auto-DevOps'
               end
             end
           end

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

@@ -72,6 +72,83 @@ stages:
   - performance
   - cleanup
 
+workflow:
+  rules:
+    - if: '$BUILDPACK_URL || $AUTO_DEVOPS_EXPLICITLY_ENABLED == "1"'
+
+    - exists:
+        - Dockerfile
+
+    # https://github.com/heroku/heroku-buildpack-clojure
+    - exists:
+        - project.clj
+
+    # https://github.com/heroku/heroku-buildpack-go
+    - exists:
+        - go.mod
+        - Gopkg.mod
+        - Godeps/Godeps.json
+        - vendor/vendor.json
+        - glide.yaml
+        - src/**/*.go
+
+    # https://github.com/heroku/heroku-buildpack-gradle
+    - exists:
+        - gradlew
+        - build.gradle
+        - settings.gradle
+
+    # https://github.com/heroku/heroku-buildpack-java
+    - exists:
+        - pom.xml
+        - pom.atom
+        - pom.clj
+        - pom.groovy
+        - pom.rb
+        - pom.scala
+        - pom.yaml
+        - pom.yml
+
+    # https://github.com/heroku/heroku-buildpack-multi
+    - exists:
+        - .buildpacks
+
+    # https://github.com/heroku/heroku-buildpack-nodejs
+    - exists:
+        - package.json
+
+    # https://github.com/heroku/heroku-buildpack-php
+    - exists:
+        - composer.json
+        - index.php
+
+    # https://github.com/heroku/heroku-buildpack-play
+    # TODO: detect script excludes some scala files
+    - exists:
+        - '**/conf/application.conf'
+
+    # https://github.com/heroku/heroku-buildpack-python
+    # TODO: detect script checks that all of these exist, not any
+    - exists:
+        - requirements.txt
+        - setup.py
+        - Pipfile
+
+    # https://github.com/heroku/heroku-buildpack-ruby
+    - exists:
+        - Gemfile
+
+    # https://github.com/heroku/heroku-buildpack-scala
+    - exists:
+        - '*.sbt'
+        - project/*.scala
+        - .sbt/*.scala
+        - project/build.properties
+
+    # https://github.com/dokku/buildpack-nginx
+    - exists:
+        - .static
+
 include:
   - template: Jobs/Build.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
   - template: Jobs/Test.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml

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

-# Auto DevOps - BETA do not use
-# This CI/CD configuration provides a standard pipeline for
-# * building a Docker image (using a buildpack if necessary),
-# * storing the image in the container registry,
-# * running tests from a buildpack,
-# * running code quality analysis,
-# * creating a review app for each topic branch,
-# * and continuous deployment to production
-#
-# Test jobs may be disabled by setting environment variables:
-# * test: TEST_DISABLED
-# * code_quality: CODE_QUALITY_DISABLED
-# * license_management: LICENSE_MANAGEMENT_DISABLED
-# * performance: PERFORMANCE_DISABLED
-# * sast: SAST_DISABLED
-# * dependency_scanning: DEPENDENCY_SCANNING_DISABLED
-# * container_scanning: CONTAINER_SCANNING_DISABLED
-# * dast: DAST_DISABLED
-# * review: REVIEW_DISABLED
-# * stop_review: REVIEW_DISABLED
-#
-# In order to deploy, you must have a Kubernetes cluster configured either
-# via a project integration, or via group/project variables.
-# KUBE_INGRESS_BASE_DOMAIN must also be set on the cluster settings,
-# as a variable at the group or project level, or manually added below.
-#
-# Continuous deployment to production is enabled by default.
-# If you want to deploy to staging first, set STAGING_ENABLED environment variable.
-# If you want to enable incremental rollout, either manual or time based,
-# set INCREMENTAL_ROLLOUT_MODE environment variable to "manual" or "timed".
-# If you want to use canary deployments, set CANARY_ENABLED environment variable.
-#
-# If Auto DevOps fails to detect the proper buildpack, or if you want to
-# specify a custom buildpack, set a project variable `BUILDPACK_URL` to the
-# repository URL of the buildpack.
-# e.g. BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-ruby.git#v142
-# If you need multiple buildpacks, add a file to your project called
-# `.buildpacks` that contains the URLs, one on each line, in order.
-# Note: Auto CI does not work with multiple buildpacks yet
-
-image: alpine:latest
-
-variables:
-  # KUBE_INGRESS_BASE_DOMAIN is the application deployment domain and should be set as a variable at the group or project level.
-  # KUBE_INGRESS_BASE_DOMAIN: domain.example.com
-
-  POSTGRES_USER: user
-  POSTGRES_PASSWORD: testing-password
-  POSTGRES_ENABLED: "true"
-  POSTGRES_DB: $CI_ENVIRONMENT_SLUG
-  POSTGRES_VERSION: 9.6.2
-
-  DOCKER_DRIVER: overlay2
-
-  ROLLOUT_RESOURCE_TYPE: deployment
-
-  DOCKER_TLS_CERTDIR: ""  # https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
-
-stages:
-  - build
-  - test
-  - deploy  # dummy stage to follow the template guidelines
-  - review
-  - dast
-  - staging
-  - canary
-  - production
-  - incremental rollout 10%
-  - incremental rollout 25%
-  - incremental rollout 50%
-  - incremental rollout 100%
-  - performance
-  - cleanup
-
-workflow:
-  rules:
-    - if: '$BUILDPACK_URL || $AUTO_DEVOPS_EXPLICITLY_ENABLED == "1"'
-
-    - exists:
-        - Dockerfile
-
-    # https://github.com/heroku/heroku-buildpack-clojure
-    - exists:
-        - project.clj
-
-    # https://github.com/heroku/heroku-buildpack-go
-    - exists:
-        - go.mod
-        - Gopkg.mod
-        - Godeps/Godeps.json
-        - vendor/vendor.json
-        - glide.yaml
-        - src/**/*.go
-
-    # https://github.com/heroku/heroku-buildpack-gradle
-    - exists:
-        - gradlew
-        - build.gradle
-        - settings.gradle
-
-    # https://github.com/heroku/heroku-buildpack-java
-    - exists:
-        - pom.xml
-        - pom.atom
-        - pom.clj
-        - pom.groovy
-        - pom.rb
-        - pom.scala
-        - pom.yaml
-        - pom.yml
-
-    # https://github.com/heroku/heroku-buildpack-multi
-    - exists:
-        - .buildpacks
-
-    # https://github.com/heroku/heroku-buildpack-nodejs
-    - exists:
-        - package.json
-
-    # https://github.com/heroku/heroku-buildpack-php
-    - exists:
-        - composer.json
-        - index.php
-
-    # https://github.com/heroku/heroku-buildpack-play
-    # TODO: detect script excludes some scala files
-    - exists:
-        - '**/conf/application.conf'
-
-    # https://github.com/heroku/heroku-buildpack-python
-    # TODO: detect script checks that all of these exist, not any
-    - exists:
-        - requirements.txt
-        - setup.py
-        - Pipfile
-
-    # https://github.com/heroku/heroku-buildpack-ruby
-    - exists:
-        - Gemfile
-
-    # https://github.com/heroku/heroku-buildpack-scala
-    - exists:
-        - '*.sbt'
-        - project/*.scala
-        - .sbt/*.scala
-        - project/build.properties
-
-    # https://github.com/dokku/buildpack-nginx
-    - exists:
-        - .static
-
-include:
-  - template: Jobs/Build.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
-  - template: Jobs/Test.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml
-  - template: Jobs/Code-Quality.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
-  - template: Jobs/Deploy.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
-  - template: Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/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-foss/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-foss/blob/master/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
-  - template: Security/Container-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
-  - template: Security/Dependency-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
-  - template: Security/License-Management.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml
-  - template: Security/SAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml

spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb

@@ -45,7 +45,7 @@ describe Gitlab::Ci::Pipeline::Chain::Config::Content do
             subject.perform!
 
             expect(pipeline.config_source).to eq 'auto_devops_source'
-            template = Gitlab::Template::GitlabCiYmlTemplate.find('Beta/Auto-DevOps')
+            template = Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps')
             expect(command.config_content).to eq(template.content)
           end
         end
@@ -78,7 +78,7 @@ describe Gitlab::Ci::Pipeline::Chain::Config::Content do
 
           expect(pipeline.config_source).to eq 'auto_devops_source'
           expect(pipeline.pipeline_config).to be_nil
-          template = Gitlab::Template::GitlabCiYmlTemplate.find('Beta/Auto-DevOps')
+          template = Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps')
           expect(command.config_content).to eq(template.content)
         end
       end
@@ -91,7 +91,7 @@ describe Gitlab::Ci::Pipeline::Chain::Config::Content do
 
           expect(pipeline.config_source).to eq 'auto_devops_source'
           expect(pipeline.pipeline_config).to be_nil
-          template = Gitlab::Template::GitlabCiYmlTemplate.find('Beta/Auto-DevOps')
+          template = Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps')
           expect(command.config_content).to eq(template.content)
         end
       end
@@ -122,34 +122,13 @@ describe Gitlab::Ci::Pipeline::Chain::Config::Content do
           expect(project).to receive(:auto_devops_enabled?).and_return(true)
         end
 
-        context 'when beta is enabled' do
-          before do
-            stub_feature_flags(auto_devops_beta: true)
-          end
-
-          it 'returns the content of AutoDevops template' do
-            subject.perform!
-
-            expect(pipeline.config_source).to eq 'auto_devops_source'
-            expect(pipeline.pipeline_config).to be_nil
-            template = Gitlab::Template::GitlabCiYmlTemplate.find('Beta/Auto-DevOps')
-            expect(command.config_content).to eq(template.content)
-          end
-        end
-
-        context 'when beta is disabled' do
-          before do
-            stub_feature_flags(auto_devops_beta: false)
-          end
-
-          it 'returns the content of AutoDevops template' do
-            subject.perform!
+        it 'returns the content of AutoDevops template' do
+          subject.perform!
 
-            expect(pipeline.config_source).to eq 'auto_devops_source'
-            expect(pipeline.pipeline_config).to be_nil
-            template = Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps')
-            expect(command.config_content).to eq(template.content)
-          end
+          expect(pipeline.config_source).to eq 'auto_devops_source'
+          expect(pipeline.pipeline_config).to be_nil
+          template = Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps')
+          expect(command.config_content).to eq(template.content)
         end
       end
 
@@ -285,7 +264,7 @@ describe Gitlab::Ci::Pipeline::Chain::Config::Content do
         <<~EOY
           ---
           include:
-          - template: Beta/Auto-DevOps.gitlab-ci.yml
+          - template: Auto-DevOps.gitlab-ci.yml
         EOY
       end
 
@@ -293,40 +272,12 @@ describe Gitlab::Ci::Pipeline::Chain::Config::Content do
         expect(project).to receive(:auto_devops_enabled?).and_return(true)
       end
 
-      context 'when beta is enabled' do
-        before do
-          stub_feature_flags(auto_devops_beta: true)
-        end
-
-        it 'builds root config including the auto-devops template' do
-          subject.perform!
-
-          expect(pipeline.config_source).to eq 'auto_devops_source'
-          expect(pipeline.pipeline_config.content).to eq(config_content_result)
-          expect(command.config_content).to eq(config_content_result)
-        end
-      end
-
-      context 'when beta is disabled' do
-        before do
-          stub_feature_flags(auto_devops_beta: false)
-        end
-
-        let(:config_content_result) do
-          <<~EOY
-            ---
-            include:
-            - template: Auto-DevOps.gitlab-ci.yml
-          EOY
-        end
-
-        it 'builds root config including the auto-devops template' do
-          subject.perform!
+      it 'builds root config including the auto-devops template' do
+        subject.perform!
 
-          expect(pipeline.config_source).to eq 'auto_devops_source'
-          expect(pipeline.pipeline_config.content).to eq(config_content_result)
-          expect(command.config_content).to eq(config_content_result)
-        end
+        expect(pipeline.config_source).to eq 'auto_devops_source'
+        expect(pipeline.pipeline_config.content).to eq(config_content_result)
+        expect(command.config_content).to eq(config_content_result)
       end
     end
 

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

@@ -133,8 +133,6 @@ describe 'Auto-DevOps.gitlab-ci.yml' do
     end
 
     with_them do
-      subject(:template) { Gitlab::Template::GitlabCiYmlTemplate.find('Beta/Auto-DevOps') }
-
       let(:user) { create(:admin) }
       let(:project) { create(:project, :custom_repo, files: files) }
       let(:service) { Ci::CreatePipelineService.new(project, user, ref: 'master' ) }