From e32de4841a7798bebf2757786677e4bf79b16b70 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Tue, 6 Apr 2021 07:40:29 +0200
Subject: [PATCH] Replace devel tests with stable-2.11. (#2131)

---
 .azure-pipelines/azure-pipelines.yml | 40 ++++++++++++++--------------
 README.md                            |  2 +-
 shippable.yml                        |  8 +++---
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 5f8c9ae32f..61b735b316 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -42,14 +42,14 @@ pool: Standard
 
 stages:
 ### Sanity
-  - stage: Sanity_devel
-    displayName: Sanity devel
+  - stage: Sanity_2_11
+    displayName: Sanity 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Test {0}
-          testFormat: devel/sanity/{0}
+          testFormat: 2.11/sanity/{0}
           targets:
             - test: 1
             - test: 2
@@ -83,14 +83,14 @@ stages:
             - test: 3
             - test: 4
 ### Units
-  - stage: Units_devel
-    displayName: Units devel
+  - stage: Units_2_11
+    displayName: Units 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: devel/units/{0}/1
+          testFormat: 2.11/units/{0}/1
           targets:
             - test: 2.6
             - test: 2.7
@@ -132,13 +132,13 @@ stages:
             - test: 3.8
 
 ## Remote
-  - stage: Remote_devel
-    displayName: Remote devel
+  - stage: Remote_2_11
+    displayName: Remote 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/{0}
+          testFormat: 2.11/{0}
           targets:
             - name: macOS 11.1
               test: macos/11.1
@@ -196,13 +196,13 @@ stages:
             - 2
 
 ### Docker
-  - stage: Docker_devel
-    displayName: Docker devel
+  - stage: Docker_2_11
+    displayName: Docker 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/linux/{0}
+          testFormat: 2.11/linux/{0}
           targets:
             - name: CentOS 6
               test: centos6
@@ -270,14 +270,14 @@ stages:
             - 5
 
 ### Cloud
-  - stage: Cloud_devel
-    displayName: Cloud devel
+  - stage: Cloud_2_11
+    displayName: Cloud 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: devel/cloud/{0}/1
+          testFormat: 2.11/cloud/{0}/1
           targets:
             - test: 2.7
             - test: 3.6
@@ -304,19 +304,19 @@ stages:
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
-      - Sanity_devel
+      - Sanity_2_11
       - Sanity_2_9
       - Sanity_2_10
-      - Units_devel
+      - Units_2_11
       - Units_2_9
       - Units_2_10
-      - Remote_devel
+      - Remote_2_11
       - Remote_2_9
       - Remote_2_10
-      - Docker_devel
+      - Docker_2_11
       - Docker_2_9
       - Docker_2_10
-      - Cloud_devel
+      - Cloud_2_11
       - Cloud_2_9
       - Cloud_2_10
     jobs:
diff --git a/README.md b/README.md
index 0e4bbfee27..c14e4a15fa 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ You can find [documentation for this collection on the Ansible docs site](https:
 
 ## Tested with Ansible
 
-Tested with the current Ansible 2.9 and 2.10 releases and the current development version of Ansible. Ansible versions before 2.9.10 are not supported.
+Tested with the current Ansible 2.9, ansible-base 2.10 and ansible-core 2.11 releases. Ansible versions before 2.9.10 are not supported.
 
 ## External requirements
 
diff --git a/shippable.yml b/shippable.yml
index bb907d21b1..85d243a1ef 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -8,10 +8,10 @@ matrix:
   exclude:
     - env: T=none
   include:
-    - env: T=devel/sanity/1
-    - env: T=devel/sanity/2
-    - env: T=devel/sanity/3
-    - env: T=devel/sanity/4
+    - env: T=2.11/sanity/1
+    - env: T=2.11/sanity/2
+    - env: T=2.11/sanity/3
+    - env: T=2.11/sanity/4
 
     - env: T=2.10/sanity/1
     - env: T=2.10/sanity/2