File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -321,7 +321,7 @@ base_centos_repo_overrides_post_yum_list: |
321321stackhpc_yum_repos : |
322322 {% if kolla_base_distro == 'rocky' and kolla_base_distro_version == '9' %}
323323 {{ stackhpc_rocky_9_repos }}
324- {% elif kolla_base_distro == 'rocky' and kolla_base_distro_version == '9 ' %}
324+ {% elif kolla_base_distro == 'rocky' and kolla_base_distro_version == '10 ' %}
325325 {{ stackhpc_rocky_10_repos }}
326326 {% endif %}
327327
Original file line number Diff line number Diff line change @@ -7,8 +7,11 @@ base_tag = noble-20241118.1
77apt_preferences = {{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/environments/ci-builder/builder-apt-preferences
88{# Similarly pinning to Rocky 9 minor version used in our repos #}
99{% elif kolla_base_distro == 'rocky' %}
10- # TODO(owenjones): check what the best way of pulling major RL version in is
11- base_tag = {{ os_release }}.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
10+ {% if kolla_base_distro_version == '9' %}
11+ base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
12+ {% elif kolla_base_distro_version == '10' %}
13+ base_tag = 10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}
14+ {% endif %}
1215# NOTE(Alex-Welsh): rpm_setup_config is intentionally left blank to override defaults
1316rpm_setup_config =
1417{% endif %}
You can’t perform that action at this time.
0 commit comments