Skip to content
Snippets Groups Projects
Unverified Commit f4070f6a authored by Thomas Woerner's avatar Thomas Woerner Committed by GitHub
Browse files

Merge pull request #1100 from rjeffman/ci_update_ansible_2_15 

upstream CI: Update ansible-core version
parents ad9a03ec 51f64e43
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.github/workflows/docs.yml
+ 9
− 9
View file @ f4070f6a
...@@ -5,7 +5,7 @@ on: ...@@ -5,7 +5,7 @@ on:
- pull_request - pull_request
jobs: jobs:
check_docs_oldest_supported: check_docs_oldest_supported:
name: Check Ansible Documentation with ansible-core 2.12. name: Check Ansible Documentation with ansible-core 2.13.
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3.1.0 - uses: actions/checkout@v3.1.0
...@@ -14,15 +14,15 @@ jobs: ...@@ -14,15 +14,15 @@ jobs:
- uses: actions/setup-python@v4.3.0 - uses: actions/setup-python@v4.3.0
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install Ansible 2.12 - name: Install Ansible 2.13
run: | run: |
python -m pip install "ansible-core >=2.12,<2.13" python -m pip install "ansible-core >=2.13,<2.14"
- name: Run ansible-doc-test - name: Run ansible-doc-test
run: | run: |
ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins
check_docs_previous: check_docs_previous:
name: Check Ansible Documentation with ansible-core 2.13. name: Check Ansible Documentation with ansible-core 2.14.
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3.1.0 - uses: actions/checkout@v3.1.0
...@@ -31,15 +31,15 @@ jobs: ...@@ -31,15 +31,15 @@ jobs:
- uses: actions/setup-python@v4.3.0 - uses: actions/setup-python@v4.3.0
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install Ansible 2.13 - name: Install Ansible 2.14
run: | run: |
python -m pip install "ansible-core >=2.13,<2.14" python -m pip install "ansible-core >=2.14,<2.15"
- name: Run ansible-doc-test - name: Run ansible-doc-test
run: | run: |
ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins
check_docs_current: check_docs_current:
name: Check Ansible Documentation with ansible-core 2.14. name: Check Ansible Documentation with ansible-core 2.15.
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3.1.0 - uses: actions/checkout@v3.1.0
...@@ -48,9 +48,9 @@ jobs: ...@@ -48,9 +48,9 @@ jobs:
- uses: actions/setup-python@v4.3.0 - uses: actions/setup-python@v4.3.0
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install Ansible 2.14 - name: Install Ansible 2.15
run: | run: |
python -m pip install "ansible-core >=2.14,<2.15" python -m pip install "ansible-core >=2.15,<2.16"
- name: Run ansible-doc-test - name: Run ansible-doc-test
run: | run: |
ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins ANSIBLE_LIBRARY="." ANSIBLE_DOC_FRAGMENT_PLUGINS="." python utils/ansible-doc-test -v roles plugins
......
.github/workflows/lint.yml
+ 1
− 1
View file @ f4070f6a
...@@ -16,7 +16,7 @@ jobs: ...@@ -16,7 +16,7 @@ jobs:
python-version: "3.x" python-version: "3.x"
- name: Run ansible-lint - name: Run ansible-lint
run: | run: |
pip install "ansible-core >=2.14,<2.15" ansible-lint pip install "ansible-core >=2.15,<2.16" ansible-lint
utils/build-galaxy-release.sh -ki utils/build-galaxy-release.sh -ki
cd .galaxy-build cd .galaxy-build
ansible-lint ansible-lint
......
tests/azure/azure-pipelines.yml
+ 5
− 5
View file @ f4070f6a
...@@ -27,7 +27,7 @@ stages: ...@@ -27,7 +27,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
# Galaxy on Fedora # Galaxy on Fedora
...@@ -38,7 +38,7 @@ stages: ...@@ -38,7 +38,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
# CentOS 9 Stream # CentOS 9 Stream
...@@ -49,7 +49,7 @@ stages: ...@@ -49,7 +49,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c9s scenario: c9s
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
# CentOS 8 Stream # CentOS 8 Stream
...@@ -60,7 +60,7 @@ stages: ...@@ -60,7 +60,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c8s scenario: c8s
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
# CentOS 7 # CentOS 7
...@@ -71,4 +71,4 @@ stages: ...@@ -71,4 +71,4 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: centos-7 scenario: centos-7
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
tests/azure/nightly.yml
+ 36
− 36
View file @ f4070f6a
...@@ -16,32 +16,32 @@ stages: ...@@ -16,32 +16,32 @@ stages:
# Fedora # Fedora
- stage: FedoraLatest_Ansible_Core_2_12 - stage: FedoraLatest_Ansible_Core_2_13
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.12,<2.13" ansible_version: "-core >=2.13,<2.14"
- stage: FedoraLatest_Ansible_Core_2_13 - stage: FedoraLatest_Ansible_Core_2_14
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
- stage: FedoraLatest_Ansible_Core_2_14 - stage: FedoraLatest_Ansible_Core_2_15
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.14,<2.15" ansible_version: "-core >=2.15,<2.16"
- stage: FedoraLatest_Ansible_latest - stage: FedoraLatest_Ansible_latest
dependsOn: [] dependsOn: []
...@@ -54,32 +54,32 @@ stages: ...@@ -54,32 +54,32 @@ stages:
# Galaxy on Fedora # Galaxy on Fedora
- stage: Galaxy_FedoraLatest_Ansible_Core_2_12 - stage: Galaxy_FedoraLatest_Ansible_Core_2_13
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/galaxy_tests.yml - template: templates/galaxy_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.12,<2.13" ansible_version: "-core >=2.13,<2.14"
- stage: Galaxy_FedoraLatest_Ansible_Core_2_13 - stage: Galaxy_FedoraLatest_Ansible_Core_2_14
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/galaxy_tests.yml - template: templates/galaxy_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
- stage: Galaxy_FedoraLatest_Ansible_Core_2_14 - stage: Galaxy_FedoraLatest_Ansible_Core_2_15
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/galaxy_tests.yml - template: templates/galaxy_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.14,<2.15" ansible_version: "-core >=2.15,<2.16"
- stage: Galaxy_FedoraLatest_Ansible_latest - stage: Galaxy_FedoraLatest_Ansible_latest
dependsOn: [] dependsOn: []
...@@ -92,32 +92,32 @@ stages: ...@@ -92,32 +92,32 @@ stages:
# Fedora Rawhide # Fedora Rawhide
- stage: FedoraRawhide_Ansible_Core_2_12 - stage: FedoraRawhide_Ansible_Core_2_13
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-rawhide scenario: fedora-rawhide
ansible_version: "-core >=2.12,<2.13" ansible_version: "-core >=2.13,<2.14"
- stage: FedoraRawhide_Ansible_Core_2_13 - stage: FedoraRawhide_Ansible_Core_2_14
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-rawhide scenario: fedora-rawhide
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
- stage: FedoraRawhide_Ansible_Core_2_14 - stage: FedoraRawhide_Ansible_Core_2_15
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-rawhide scenario: fedora-rawhide
ansible_version: "-core >=2.14,<2.15" ansible_version: "-core >=2.15,<2.16"
- stage: FedoraRawhide_Ansible_latest - stage: FedoraRawhide_Ansible_latest
dependsOn: [] dependsOn: []
...@@ -130,32 +130,32 @@ stages: ...@@ -130,32 +130,32 @@ stages:
# CentoOS 9 Stream # CentoOS 9 Stream
- stage: c9s_Ansible_Core_2_12 - stage: c9s_Ansible_Core_2_13
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c9s scenario: c9s
ansible_version: "-core >=2.12,<2.13" ansible_version: "-core >=2.13,<2.14"
- stage: c9s_Ansible_Core_2_13 - stage: c9s_Ansible_Core_2_14
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c9s scenario: c9s
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
- stage: c9s_Ansible_Core_2_14 - stage: c9s_Ansible_Core_2_15
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c9s scenario: c9s
ansible_version: "-core >=2.14,<2.15" ansible_version: "-core >=2.15,<2.16"
- stage: c9s_Ansible_latest - stage: c9s_Ansible_latest
dependsOn: [] dependsOn: []
...@@ -168,32 +168,32 @@ stages: ...@@ -168,32 +168,32 @@ stages:
# CentOS 8 Stream # CentOS 8 Stream
- stage: c8s_Ansible_Core_2_12 - stage: c8s_Ansible_Core_2_13
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c8s scenario: c8s
ansible_version: "-core >=2.12,<2.13" ansible_version: "-core >=2.13,<2.14"
- stage: c8s_Ansible_Core_2_13 - stage: c8s_Ansible_Core_2_14
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c8s scenario: c8s
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
- stage: c8s_Ansible_Core_2_14 - stage: c8s_Ansible_Core_2_15
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c8s scenario: c8s
ansible_version: "-core >=2.14,<2.15" ansible_version: "-core >=2.15,<2.16"
- stage: c8s_Ansible_latest - stage: c8s_Ansible_latest
dependsOn: [] dependsOn: []
...@@ -206,32 +206,32 @@ stages: ...@@ -206,32 +206,32 @@ stages:
# CentOS 7 # CentOS 7
- stage: CentOS7_Ansible_Core_2_12 - stage: CentOS7_Ansible_Core_2_13
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: centos-7 scenario: centos-7
ansible_version: "-core >=2.12,<2.13" ansible_version: "-core >=2.13,<2.14"
- stage: CentOS7_Ansible_Core_2_13 - stage: CentOS7_Ansible_Core_2_14
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: centos-7 scenario: centos-7
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
- stage: CentOS7_Ansible_Core_2_14 - stage: CentOS7_Ansible_Core_2_15
dependsOn: [] dependsOn: []
jobs: jobs:
- template: templates/group_tests.yml - template: templates/group_tests.yml
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: centos-7 scenario: centos-7
ansible_version: "-core >=2.14,<2.15" ansible_version: "-core >=2.15,<2.16"
- stage: CentOS7_Ansible_latest - stage: CentOS7_Ansible_latest
dependsOn: [] dependsOn: []
......
tests/azure/pr-pipeline.yml
+ 6
− 6
View file @ f4070f6a
...@@ -16,7 +16,7 @@ stages: ...@@ -16,7 +16,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.12,<2.13" ansible_version: "-core >=2.14,<2.15"
# Galaxy on Fedora # Galaxy on Fedora
...@@ -27,7 +27,7 @@ stages: ...@@ -27,7 +27,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-latest scenario: fedora-latest
ansible_version: "-core >=2.12,<2.13" ansible_version: "-core >=2.14,<2.15"
# CentOS 9 Stream # CentOS 9 Stream
...@@ -38,7 +38,7 @@ stages: ...@@ -38,7 +38,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c9s scenario: c9s
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
# CentOS 8 Stream # CentOS 8 Stream
...@@ -49,7 +49,7 @@ stages: ...@@ -49,7 +49,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: c8s scenario: c8s
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
# CentOS 7 # CentOS 7
...@@ -60,7 +60,7 @@ stages: ...@@ -60,7 +60,7 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: centos-7 scenario: centos-7
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
# Rawhide # Rawhide
...@@ -71,4 +71,4 @@ stages: ...@@ -71,4 +71,4 @@ stages:
parameters: parameters:
build_number: $(Build.BuildNumber) build_number: $(Build.BuildNumber)
scenario: fedora-rawhide scenario: fedora-rawhide
ansible_version: "-core >=2.13,<2.14" ansible_version: "-core >=2.14,<2.15"
utils/run-tests.sh
+ 1
− 1
View file @ f4070f6a
...@@ -162,7 +162,7 @@ list_images() { ...@@ -162,7 +162,7 @@ list_images() {
# Defaults # Defaults
ANSIBLE_VERSION=${ANSIBLE_VERSION:-'ansible-core>=2.12,<2.13'} ANSIBLE_VERSION=${ANSIBLE_VERSION:-'ansible-core'}
verbose="" verbose=""
FORCE_ENV="N" FORCE_ENV="N"
CONTINUE_ON_ERROR="" CONTINUE_ON_ERROR=""
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment