Skip to content

Commit

Permalink
cloud: replace CentOS8 with Fedora34 (#982)
Browse files Browse the repository at this point in the history
cloud: replace CentOS8 with Fedora34

The initial goal was  to speed up the update of the controller node during the
deployment. We can also benefit from the large collection of Python
releases that come by default with Fedora 34.
  • Loading branch information
goneri authored Jul 8, 2021
1 parent 2d2fa2d commit f7f6988
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 17 deletions.
6 changes: 3 additions & 3 deletions zuul.d/ansible-cloud-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
- job:
name: ansible-test-splitter
run: playbooks/ansible-test-splitter/run.yaml
nodeset: controller-python36
nodeset: controller-python36-f34
required-projects:
- name: github.com/ansible/ansible
timeout: 1000
Expand All @@ -318,7 +318,7 @@
- job:
name: ansible-test-cloud-integration-aws-py36
parent: ansible-core-ci-aws-session
nodeset: controller-python36
nodeset: controller-python36-f34
dependencies:
- name: build-ansible-collection
- name: ansible-test-splitter
Expand Down Expand Up @@ -416,7 +416,7 @@
- job:
name: ansible-test-sanity-aws-ansible
parent: ansible-test-sanity-docker
nodeset: controller-python36
nodeset: controller-python36-f34
dependencies:
- name: build-ansible-collection
soft: true
Expand Down
38 changes: 24 additions & 14 deletions zuul.d/nodesets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
- nodeset:
name: fedora-latest-1vcpu
nodes:
- name: fedora-32
label: fedora-32-1vcpu
- name: fedora-34
label: fedora-34-1vcpu

- nodeset:
name: ubuntu-bionic-1vcpu
Expand Down Expand Up @@ -51,19 +51,19 @@
- nodeset:
name: vmware-govcsim-python36
nodes:
- name: centos-8
label: centos-8-1vcpu
- name: fedora-34
label: fedora-34-1vcpu
groups:
- name: controller
nodes:
- centos-8
- fedora-34

# vcenter 7.0.2
- nodeset:
name: vmware-vcsa-7.0.2-python36
nodes:
- name: centos-8
label: centos-8-1vcpu
- name: fedora-34
label: fedora-34-1vcpu
- name: vcenter
label: vmware-vcsa-7.0.2
groups:
Expand All @@ -72,13 +72,13 @@
- vcenter
- name: controller
nodes:
- centos-8
- fedora-34

- nodeset:
name: vmware-vcsa_1esxi-7.0.2-python36
nodes:
- name: centos-8
label: centos-8-1vcpu
- name: fedora-34
label: fedora-34-1vcpu
- name: vcenter
label: vmware-vcsa-7.0.2
- name: esxi1
Expand All @@ -95,13 +95,13 @@
- esxi1
- name: controller
nodes:
- centos-8
- fedora-34

- nodeset:
name: vmware-vcsa_2esxi-7.0.2-python36
nodes:
- name: centos-8
label: centos-8-1vcpu
- name: fedora-34
label: fedora-34-1vcpu
- name: vcenter
label: vmware-vcsa-7.0.2
- name: esxi1
Expand All @@ -122,7 +122,7 @@
- esxi2
- name: controller
nodes:
- centos-8
- fedora-34

# Ansible network appliance nodesets
- nodeset:
Expand Down Expand Up @@ -863,6 +863,16 @@
nodes:
- ubuntu-bionic

- nodeset:
name: controller-python36-f34
nodes:
- name: fedora-34
label: fedora-34-1vcpu
groups:
- name: controller
nodes:
- fedora-34

# Ansible Security appliance nodesets
- nodeset:
name: QRadarCE-7.3.1-python38
Expand Down

0 comments on commit f7f6988

Please sign in to comment.