Skip to content

Commit

Permalink
upstream CI: bump vm and ansible versions
Browse files Browse the repository at this point in the history
As ansible-core 2.17 was released and it does not support Python 2 or
Python 3.6, this patch adds tests for both latest ansible-core and
ansible-core 2.16, and it also bumps the different versions of
ansible-core to use 2.14, 2.15 and 2.16 for the pipelines.

Also, the Ubuntu VM image version is updated to 22.04.
  • Loading branch information
rjeffman committed May 22, 2024
1 parent 8f8a16f commit 5c2ec08
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 53 deletions.
27 changes: 19 additions & 8 deletions tests/azure/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ trigger:
- master

pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

stages:

Expand Down Expand Up @@ -31,25 +31,36 @@ stages:

# Fedora

- stage: Fedora_Latest
- stage: Fedora_Ansible_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"

# Galaxy on Fedora

- stage: Galaxy_Fedora_Latest
- stage: Galaxy_Fedora_Ansible_Latest
dependsOn: []
jobs:
- template: templates/galaxy_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core"

# Galaxy on Fedora

- stage: Galaxy_Fedora_Ansible_2_16
dependsOn: []
jobs:
- template: templates/galaxy_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.16,<2.17"

# CentOS 9 Stream

Expand All @@ -60,7 +71,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"

# CentOS 8 Stream

Expand All @@ -71,7 +82,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"

# CentOS 7

Expand All @@ -82,4 +93,4 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"
2 changes: 1 addition & 1 deletion tests/azure/build-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ schedules:
trigger: none

pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

stages:

Expand Down
74 changes: 37 additions & 37 deletions tests/azure/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,38 @@ schedules:
trigger: none

pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

stages:

# Fedora

- stage: FedoraLatest_Ansible_Core_2_13
- stage: FedoraLatest_Ansible_Core_2_14
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
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: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.15,<2.16"

- stage: FedoraLatest_Ansible_Core_2_15
- stage: FedoraLatest_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.15,<2.16"
ansible_version: "-core >=2.16,<2.17"

- stage: FedoraLatest_Ansible_latest
dependsOn: []
Expand All @@ -54,32 +54,32 @@ stages:

# Galaxy on Fedora

- stage: Galaxy_FedoraLatest_Ansible_Core_2_13
- stage: Galaxy_FedoraLatest_Ansible_Core_2_14
dependsOn: []
jobs:
- template: templates/galaxy_tests.yml
parameters:
build_number: $(Build.BuildNumber)
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: []
jobs:
- template: templates/galaxy_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.15,<2.16"

- stage: Galaxy_FedoraLatest_Ansible_Core_2_15
- stage: Galaxy_FedoraLatest_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/galaxy_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.15,<2.16"
ansible_version: "-core >=2.16,<2.17"

- stage: Galaxy_FedoraLatest_Ansible_latest
dependsOn: []
Expand All @@ -92,32 +92,32 @@ stages:

# Fedora Rawhide

- stage: FedoraRawhide_Ansible_Core_2_13
- stage: FedoraRawhide_Ansible_Core_2_14
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
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: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-rawhide
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.15,<2.16"

- stage: FedoraRawhide_Ansible_Core_2_15
- stage: FedoraRawhide_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-rawhide
ansible_version: "-core >=2.15,<2.16"
ansible_version: "-core >=2.16,<2.17"

- stage: FedoraRawhide_Ansible_latest
dependsOn: []
Expand All @@ -130,32 +130,32 @@ stages:

# CentoOS 9 Stream

- stage: c9s_Ansible_Core_2_13
- stage: c9s_Ansible_Core_2_14
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
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: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.15,<2.16"

- stage: c9s_Ansible_Core_2_15
- stage: c9s_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
ansible_version: "-core >=2.15,<2.16"
ansible_version: "-core >=2.16,<2.17"

- stage: c9s_Ansible_latest
dependsOn: []
Expand All @@ -168,32 +168,32 @@ stages:

# CentOS 8 Stream

- stage: c8s_Ansible_Core_2_13
- stage: c8s_Ansible_Core_2_14
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
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: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.15,<2.16"

- stage: c8s_Ansible_Core_2_15
- stage: c8s_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
ansible_version: "-core >=2.15,<2.16"
ansible_version: "-core >=2.16,<2.17"

- stage: c8s_Ansible_latest
dependsOn: []
Expand All @@ -206,32 +206,32 @@ stages:

# CentOS 7

- stage: CentOS7_Ansible_Core_2_13
- stage: CentOS7_Ansible_Core_2_14
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
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: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.15,<2.16"

- stage: CentOS7_Ansible_Core_2_15
- stage: CentOS7_Ansible_Core_2_16
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
ansible_version: "-core >=2.15,<2.16"
ansible_version: "-core >=2.16,<2.17"

- stage: CentOS7_Ansible_latest
dependsOn: []
Expand Down
14 changes: 7 additions & 7 deletions tests/azure/pr-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ trigger:
- master

pool:
vmImage: 'ubuntu-20.04'
vmImage: 'ubuntu-22.04'

stages:

Expand All @@ -16,7 +16,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.15,<2.16"

# Galaxy on Fedora

Expand All @@ -27,7 +27,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-latest
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"

# CentOS 9 Stream

Expand All @@ -38,7 +38,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: c9s
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"

# CentOS 8 Stream

Expand All @@ -49,7 +49,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: c8s
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"

# CentOS 7

Expand All @@ -60,7 +60,7 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: centos-7
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"

# Rawhide

Expand All @@ -71,4 +71,4 @@ stages:
parameters:
build_number: $(Build.BuildNumber)
scenario: fedora-rawhide
ansible_version: "-core >=2.14,<2.15"
ansible_version: "-core >=2.16,<2.17"

0 comments on commit 5c2ec08

Please sign in to comment.