Merge branch 'auto-devops-rules-troubleshoot' into 'master'

Auto DevOps: Add troubleshoot section for rules

See merge request gitlab-org/gitlab!31516

doc/topics/autodevops/customize.md

@@ -227,6 +227,8 @@ If your `.gitlab-ci.yml` extends these Auto DevOps templates and override the `o
 `except` keywords, you must migrate your templates to use the
 [`rules`](../../ci/yaml/README.md#rules) syntax after the
 base template is migrated to use the `rules` syntax.
+For users who cannot migrate just yet, you can alternatively pin your templates to
+the [GitLab 12.10 based templates](https://gitlab.com/gitlab-org/auto-devops-v12-10).
 
 ## PostgreSQL database support
 

doc/topics/autodevops/index.md

@@ -462,6 +462,22 @@ The following are possible reasons:
 Auto Test may fail because of a mismatch between testing frameworks. In this
 case, you may need to customize your `.gitlab-ci.yml` with your test commands.
 
+### Pipeline that extends Auto DevOps with only / except fails
+
+If your pipeline fails with the following message:
+
+```plaintext
+Found errors in your .gitlab-ci.yml:
+
+  jobs:test config key may not be used with `rules`: only
+```
+
+This error appears when the included job’s rules configuration has been overridden with the `only` or `except` syntax.
+To fix this issue, you must either:
+
+- Transition your `only/except` syntax to rules.
+- (Temporarily) Pin your templates to the [GitLab 12.10 based templates](https://gitlab.com/gitlab-org/auto-devops-v12-10).
+
 ### Failure to create a Kubernetes namespace
 
 Auto Deploy will fail if GitLab can't create a Kubernetes namespace and