From 92bd840b61c7963eb54e0c8de12618b8fe22b715 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 6 Jan 2021 06:10:11 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rails.gitlab-ci.yml | 14 ++++++++++++++ .gitlab/ci/rules.gitlab-ci.yml | 2 -- doc/administration/terraform_state.md | 7 ++----- doc/ci/yaml/README.md | 19 ++++++++++++++++--- doc/topics/autodevops/index.md | 5 ++++- doc/user/clusters/agent/index.md | 3 ++- doc/user/project/integrations/webhooks.md | 2 +- 7 files changed, 39 insertions(+), 13 deletions(-) diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index f5e12f0730c..516816fab56 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -392,6 +392,20 @@ rspec:deprecations: - .rails:rules:deprecations stage: post-test allow_failure: true + # We cannot use needs since it would mean needing 84 jobs (since most are parallelized) + # so we use `dependencies` here. + dependencies: + - rspec migration pg11 + - rspec unit pg11 + - rspec integration pg11 + - rspec system pg11 + - rspec-ee migration pg11 + - rspec-ee unit pg11 + - rspec-ee integration pg11 + - rspec-ee system pg11 + - rspec-ee unit pg11 geo + - rspec-ee integration pg11 geo + - rspec-ee system pg11 geo variables: SETUP_DB: "false" script: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 74f8dba8036..43e7b7ab745 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -835,8 +835,6 @@ rules: - <<: *if-not-ee when: never - - <<: *if-merge-request - changes: *code-backstage-patterns - <<: *if-master-schedule-nightly - <<: *if-merge-request-title-run-all-rspec diff --git a/doc/administration/terraform_state.md b/doc/administration/terraform_state.md index edd44380f30..be5647aa133 100644 --- a/doc/administration/terraform_state.md +++ b/doc/administration/terraform_state.md @@ -20,11 +20,8 @@ These locations can be configured using the options described below. ## Using local storage -NOTE: -This is the default configuration - -To change the location where Terraform state files are stored locally, follow the steps -below. +The default configuration uses local storage. To change the location where +Terraform state files are stored locally, follow the steps below. **In Omnibus installations:** diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 3944e362b7a..539b20c3022 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -3547,9 +3547,6 @@ There can be from 2 to 50 jobs. Jobs can only run in parallel if there are multiple runners, or a single runner is [configured to run multiple jobs concurrently](#using-your-own-runners). -[In GitLab 13.5](https://gitlab.com/gitlab-org/gitlab/-/issues/26362) and later, -you can have one-dimensional matrices with a single job. - Every job gets the same `CI_NODE_TOTAL` [environment variable](../variables/README.md#predefined-environment-variables) value, and a unique `CI_NODE_INDEX` value. ```yaml @@ -3588,6 +3585,22 @@ deploystacks: [vultr, processing] The job naming style was [improved in GitLab 13.4](https://gitlab.com/gitlab-org/gitlab/-/issues/230452). +##### One-dimensional `matrix` jobs + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/26362) in GitLab 13.5. + +You can also have one-dimensional matrices with a single job: + +```yaml +deploystacks: + stage: deploy + script: + - bin/deploy + parallel: + matrix: + - PROVIDER: [aws, ovh, gcp, vultr] +``` + ### `trigger` > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/8997) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.8. diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index faf8f15d031..78be67a5196 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -30,9 +30,12 @@ configuration. Automation enables consistency across your projects, seamless management of processes, and faster creation of new projects: push your code, and GitLab does the rest, improving your productivity and efficiency. + For an introduction to Auto DevOps, watch [AutoDevOps in GitLab 11.0](https://youtu.be/0Tc0YYBxqi4). -For requirements, see [Requirements for Auto DevOps](requirements.md) for more information. +For requirements, read [Requirements for Auto DevOps](requirements.md) for more information. + +For a developer's guide, read [Auto DevOps development guide](../../development/auto_devops.md). ## Enabled by default diff --git a/doc/user/clusters/agent/index.md b/doc/user/clusters/agent/index.md index e829d90e0cb..2c0d9b6c9ce 100644 --- a/doc/user/clusters/agent/index.md +++ b/doc/user/clusters/agent/index.md @@ -22,7 +22,8 @@ tasks in a secure and cloud-native way. It enables: [GitOps Engine](https://github.com/argoproj/gitops-engine). - Real-time access to API endpoints in a cluster. -Many more features are planned. Please [review our roadmap](https://gitlab.com/groups/gitlab-org/-/epics/3329). +Many more features are planned. Please review [our roadmap](https://gitlab.com/groups/gitlab-org/-/epics/3329) +and [our development documentation](../../../development/agent/index.md). ## GitLab Agent GitOps workflow diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index d8b51e8b777..6702b48d0de 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -1362,7 +1362,7 @@ X-Gitlab-Event: Deployment Hook Note that `deployable_id` is the ID of the CI job. -### Member events +### Member events **(PREMIUM)** > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/260347) in GitLab 13.7.