From ef5046d47d9f24f48f2679bb94ed3b090ae53cb1 Mon Sep 17 00:00:00 2001
From: pulpbot <pulpbot@users.noreply.github.com>
Date: Wed, 10 May 2023 08:37:36 -0400
Subject: [PATCH] Update CI files from 0.13 branch (#1450)

* Update CI files

[noissue]

* Fix sphinx intersphinx_mapping config. (#1439)

New value comes from https://www.sphinx-doc.org/en/master/usage/extensions/intersphinx.html#configuration

[noissue]

Signed-off-by: James Tanner <tanner.jc@gmail.com>
(cherry picked from commit ee877c0a92f2ba9e3a69dd2ad515afd9e3a4d3fc)

---------

Co-authored-by: jctanner <tanner.jc@gmail.com>
---
 .github/template_gitref               | 2 +-
 .github/workflows/ci.yml              | 5 +++++
 .github/workflows/codeql-analysis.yml | 4 ++++
 .github/workflows/nightly.yml         | 4 ++++
 docs/conf.py                          | 2 +-
 functest_requirements.txt             | 1 +
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/template_gitref b/.github/template_gitref
index 5d26ea12e..336a16b90 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-212-g18b9346
+2021.08.26-213-ge6bd9ec
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index adccb28b5..88fced7b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,11 @@
 ---
 name: Ansible CI
 on: {pull_request: {branches: ['*']}}
+
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
 
   ready-to-ship:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f784b5bce..edd049275 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -11,6 +11,10 @@ on:
   schedule:
     - cron: '37 1 * * 6'
 
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index fa5e09b5a..245b1f263 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,6 +14,10 @@ on:
     - cron: '00 3 * * *'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
diff --git a/docs/conf.py b/docs/conf.py
index 96613a502..2cb5be70b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -173,4 +173,4 @@
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
diff --git a/functest_requirements.txt b/functest_requirements.txt
index d96525b7b..3a9353a82 100644
--- a/functest_requirements.txt
+++ b/functest_requirements.txt
@@ -1,4 +1,5 @@
 pulp-smash @ git+https://github.com/pulp/pulp-smash.git
+ansible-core!=2.13.9,!=2.14.5
 orionutils
 pytest
 dynaconf