diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 7c72492dcd..faa0fa661c 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1186,15 +1186,17 @@ kafka_broker_count: "{{ groups['kafka'] | length }}" # Internal Image options ######################### distro_python_version_map: { - "centos": "3.6", + "centos": "3.9", "debian": "3.9", "rhel": "3.6", + "rocky": "3.9", "ubuntu": "3.10" } kolla_base_distro_version_default_map: { - "centos": "stream8", + "centos": "stream9", "debian": "bullseye", + "rocky": "9", "ubuntu": "jammy", } diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 378055f6c5..7a2ab3e43b 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -39,7 +39,7 @@ parent: kolla-ansible-base nodeset: kolla-ansible-rocky9 vars: - base_distro: centos + base_distro: rocky tls_enabled: true - job: @@ -55,7 +55,7 @@ parent: kolla-ansible-kvm-base nodeset: kolla-ansible-rocky9-nested-virt vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-kvm @@ -69,7 +69,7 @@ parent: kolla-ansible-ipv6-base nodeset: kolla-ansible-rocky9-multi vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-multinode-ipv6 @@ -84,7 +84,7 @@ nodeset: kolla-ansible-rocky9-multi timeout: 9000 vars: - base_distro: centos + base_distro: rocky cephadm_use_package_from_distribution: true - job: @@ -101,7 +101,7 @@ parent: kolla-ansible-mariadb-base nodeset: kolla-ansible-rocky9-multi vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-mariadb @@ -116,7 +116,7 @@ nodeset: kolla-ansible-rocky9 timeout: 9000 vars: - base_distro: centos + base_distro: rocky install_type: source is_upgrade: yes tls_enabled: true @@ -165,7 +165,7 @@ nodeset: kolla-ansible-rocky9-multi timeout: 9000 vars: - base_distro: centos + base_distro: rocky install_type: source is_upgrade: yes @@ -185,7 +185,7 @@ nodeset: kolla-ansible-rocky9-multi timeout: 9000 vars: - base_distro: centos + base_distro: rocky install_type: source is_upgrade: yes @@ -204,7 +204,7 @@ parent: kolla-ansible-bifrost-base nodeset: kolla-ansible-rocky9 vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-bifrost @@ -218,7 +218,7 @@ parent: kolla-ansible-zun-base nodeset: kolla-ansible-rocky9-multi vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-debian-source-zun @@ -239,7 +239,7 @@ parent: kolla-ansible-swift-base nodeset: kolla-ansible-rocky9-multi vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-swift @@ -254,7 +254,7 @@ nodeset: kolla-ansible-rocky9-multi timeout: 10800 vars: - base_distro: centos + base_distro: rocky install_type: source is_upgrade: yes @@ -273,14 +273,14 @@ parent: kolla-ansible-scenario-nfv-base nodeset: kolla-ansible-rocky9-multi vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-rocky9-source-ironic parent: kolla-ansible-ironic-base nodeset: kolla-ansible-rocky9 vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-debian-source-ironic @@ -301,7 +301,7 @@ parent: kolla-ansible-magnum-base nodeset: kolla-ansible-rocky9 vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-magnum @@ -315,7 +315,7 @@ parent: kolla-ansible-octavia-base nodeset: kolla-ansible-rocky9 vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-octavia @@ -336,14 +336,14 @@ parent: kolla-ansible-masakari-base nodeset: kolla-ansible-rocky9-masakari vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-rocky9-source-monasca parent: kolla-ansible-monasca-base nodeset: kolla-ansible-rocky9-multi-monasca vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-cells @@ -357,14 +357,14 @@ parent: kolla-ansible-cells-base nodeset: kolla-ansible-rocky9-multi vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-rocky9-source-ovn parent: kolla-ansible-ovn-base nodeset: kolla-ansible-rocky9-multi vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-ovn @@ -378,7 +378,7 @@ parent: kolla-ansible-prometheus-efk-base nodeset: kolla-ansible-rocky9 vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-prometheus-efk @@ -392,7 +392,7 @@ parent: kolla-ansible-venus-base nodeset: kolla-ansible-rocky9 vars: - base_distro: centos + base_distro: rocky - job: name: kolla-ansible-ubuntu-source-venus @@ -406,4 +406,4 @@ parent: kolla-ansible-hashi-vault-base nodeset: kolla-ansible-rocky9 vars: - base_distro: centos + base_distro: rocky diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 5f3dbd0f2b..549a88f450 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -42,16 +42,16 @@ - kolla-ansible-ubuntu-source-upgrade - kolla-ansible-ubuntu-binary-upgrade - kolla-ansible-ubuntu-source-cells - - kolla-ansible-rocky9-source-cells + # - kolla-ansible-rocky9-source-cells - kolla-ansible-rocky9-source-mariadb - kolla-ansible-ubuntu-source-mariadb - kolla-ansible-rocky9-source-ovn - kolla-ansible-ubuntu-source-ovn # - kolla-ansible-rocky9-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-rocky9-source-venus + # - kolla-ansible-rocky9-source-venus - kolla-ansible-ubuntu-source-venus - kolla-ansible-rocky9-source-cephadm - kolla-ansible-ubuntu-source-cephadm