Add Rocky to default distro map and use published images

This patch also changes python version and default tag for centos.
prometheus-efk and venus jobs commented out, elasticsearch images
are unbuildable
cells is commented out because proxysql is unbuildable

Change-Id: Ic358f8b600317d3c2fc45130a59785225aea1153
This commit is contained in:
Michal Nasiadka 2022-10-03 09:20:57 +02:00
parent 4c60cc524c
commit c026666551
3 changed files with 30 additions and 28 deletions

View File

@ -1186,15 +1186,17 @@ kafka_broker_count: "{{ groups['kafka'] | length }}"
# Internal Image options # Internal Image options
######################### #########################
distro_python_version_map: { distro_python_version_map: {
"centos": "3.6", "centos": "3.9",
"debian": "3.9", "debian": "3.9",
"rhel": "3.6", "rhel": "3.6",
"rocky": "3.9",
"ubuntu": "3.10" "ubuntu": "3.10"
} }
kolla_base_distro_version_default_map: { kolla_base_distro_version_default_map: {
"centos": "stream8", "centos": "stream9",
"debian": "bullseye", "debian": "bullseye",
"rocky": "9",
"ubuntu": "jammy", "ubuntu": "jammy",
} }

View File

@ -39,7 +39,7 @@
parent: kolla-ansible-base parent: kolla-ansible-base
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
vars: vars:
base_distro: centos base_distro: rocky
tls_enabled: true tls_enabled: true
- job: - job:
@ -55,7 +55,7 @@
parent: kolla-ansible-kvm-base parent: kolla-ansible-kvm-base
nodeset: kolla-ansible-rocky9-nested-virt nodeset: kolla-ansible-rocky9-nested-virt
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-kvm name: kolla-ansible-ubuntu-source-kvm
@ -69,7 +69,7 @@
parent: kolla-ansible-ipv6-base parent: kolla-ansible-ipv6-base
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-multinode-ipv6 name: kolla-ansible-ubuntu-source-multinode-ipv6
@ -84,7 +84,7 @@
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
timeout: 9000 timeout: 9000
vars: vars:
base_distro: centos base_distro: rocky
cephadm_use_package_from_distribution: true cephadm_use_package_from_distribution: true
- job: - job:
@ -101,7 +101,7 @@
parent: kolla-ansible-mariadb-base parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-mariadb name: kolla-ansible-ubuntu-source-mariadb
@ -116,7 +116,7 @@
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
timeout: 9000 timeout: 9000
vars: vars:
base_distro: centos base_distro: rocky
install_type: source install_type: source
is_upgrade: yes is_upgrade: yes
tls_enabled: true tls_enabled: true
@ -165,7 +165,7 @@
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
timeout: 9000 timeout: 9000
vars: vars:
base_distro: centos base_distro: rocky
install_type: source install_type: source
is_upgrade: yes is_upgrade: yes
@ -185,7 +185,7 @@
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
timeout: 9000 timeout: 9000
vars: vars:
base_distro: centos base_distro: rocky
install_type: source install_type: source
is_upgrade: yes is_upgrade: yes
@ -204,7 +204,7 @@
parent: kolla-ansible-bifrost-base parent: kolla-ansible-bifrost-base
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-bifrost name: kolla-ansible-ubuntu-source-bifrost
@ -218,7 +218,7 @@
parent: kolla-ansible-zun-base parent: kolla-ansible-zun-base
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-debian-source-zun name: kolla-ansible-debian-source-zun
@ -239,7 +239,7 @@
parent: kolla-ansible-swift-base parent: kolla-ansible-swift-base
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-swift name: kolla-ansible-ubuntu-source-swift
@ -254,7 +254,7 @@
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
timeout: 10800 timeout: 10800
vars: vars:
base_distro: centos base_distro: rocky
install_type: source install_type: source
is_upgrade: yes is_upgrade: yes
@ -273,14 +273,14 @@
parent: kolla-ansible-scenario-nfv-base parent: kolla-ansible-scenario-nfv-base
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-rocky9-source-ironic name: kolla-ansible-rocky9-source-ironic
parent: kolla-ansible-ironic-base parent: kolla-ansible-ironic-base
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-debian-source-ironic name: kolla-ansible-debian-source-ironic
@ -301,7 +301,7 @@
parent: kolla-ansible-magnum-base parent: kolla-ansible-magnum-base
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-magnum name: kolla-ansible-ubuntu-source-magnum
@ -315,7 +315,7 @@
parent: kolla-ansible-octavia-base parent: kolla-ansible-octavia-base
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-octavia name: kolla-ansible-ubuntu-source-octavia
@ -336,14 +336,14 @@
parent: kolla-ansible-masakari-base parent: kolla-ansible-masakari-base
nodeset: kolla-ansible-rocky9-masakari nodeset: kolla-ansible-rocky9-masakari
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-rocky9-source-monasca name: kolla-ansible-rocky9-source-monasca
parent: kolla-ansible-monasca-base parent: kolla-ansible-monasca-base
nodeset: kolla-ansible-rocky9-multi-monasca nodeset: kolla-ansible-rocky9-multi-monasca
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-cells name: kolla-ansible-ubuntu-source-cells
@ -357,14 +357,14 @@
parent: kolla-ansible-cells-base parent: kolla-ansible-cells-base
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-rocky9-source-ovn name: kolla-ansible-rocky9-source-ovn
parent: kolla-ansible-ovn-base parent: kolla-ansible-ovn-base
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-ovn name: kolla-ansible-ubuntu-source-ovn
@ -378,7 +378,7 @@
parent: kolla-ansible-prometheus-efk-base parent: kolla-ansible-prometheus-efk-base
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-prometheus-efk name: kolla-ansible-ubuntu-source-prometheus-efk
@ -392,7 +392,7 @@
parent: kolla-ansible-venus-base parent: kolla-ansible-venus-base
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
vars: vars:
base_distro: centos base_distro: rocky
- job: - job:
name: kolla-ansible-ubuntu-source-venus name: kolla-ansible-ubuntu-source-venus
@ -406,4 +406,4 @@
parent: kolla-ansible-hashi-vault-base parent: kolla-ansible-hashi-vault-base
nodeset: kolla-ansible-rocky9 nodeset: kolla-ansible-rocky9
vars: vars:
base_distro: centos base_distro: rocky

View File

@ -42,16 +42,16 @@
- kolla-ansible-ubuntu-source-upgrade - kolla-ansible-ubuntu-source-upgrade
- kolla-ansible-ubuntu-binary-upgrade - kolla-ansible-ubuntu-binary-upgrade
- kolla-ansible-ubuntu-source-cells - kolla-ansible-ubuntu-source-cells
- kolla-ansible-rocky9-source-cells # - kolla-ansible-rocky9-source-cells
- kolla-ansible-rocky9-source-mariadb - kolla-ansible-rocky9-source-mariadb
- kolla-ansible-ubuntu-source-mariadb - kolla-ansible-ubuntu-source-mariadb
- kolla-ansible-rocky9-source-ovn - kolla-ansible-rocky9-source-ovn
- kolla-ansible-ubuntu-source-ovn - kolla-ansible-ubuntu-source-ovn
# - kolla-ansible-rocky9-source-upgrade-ovn # - kolla-ansible-rocky9-source-upgrade-ovn
- kolla-ansible-ubuntu-source-upgrade-ovn - kolla-ansible-ubuntu-source-upgrade-ovn
- kolla-ansible-rocky9-source-prometheus-efk # - kolla-ansible-rocky9-source-prometheus-efk
- kolla-ansible-ubuntu-source-prometheus-efk - kolla-ansible-ubuntu-source-prometheus-efk
- kolla-ansible-rocky9-source-venus # - kolla-ansible-rocky9-source-venus
- kolla-ansible-ubuntu-source-venus - kolla-ansible-ubuntu-source-venus
- kolla-ansible-rocky9-source-cephadm - kolla-ansible-rocky9-source-cephadm
- kolla-ansible-ubuntu-source-cephadm - kolla-ansible-ubuntu-source-cephadm