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 <[email protected]> (cherry picked from commit ee877c0) --------- Co-authored-by: jctanner <[email protected]>
pulp · May 10, 2023 · ef5046d · ef5046d
1 parent bb6ab7c
commit ef5046d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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