Skip to content

Commit 42eb4d2

Browse files
committed
try this
1 parent 33b05ec commit 42eb4d2

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

etc/kayobe/kolla.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,14 +314,14 @@ stackhpc_epel_10_repos:
314314
base_centos_repo_overrides_post_yum_list: |
315315
{% if kolla_base_distro == 'rocky' and kolla_base_distro_version == '9' %}
316316
{{ stackhpc_rocky_9_repos + stackhpc_epel_9_repos + stackhpc_rocky_9_additional_repos + stackhpc_rocky_9_third_party_repos }}
317-
{% elif kolla_base_distro == 'rocky' and kolla_base_distro_version == '9' %}
317+
{% elif kolla_base_distro == 'rocky' and kolla_base_distro_version == '10' %}
318318
{{ stackhpc_rocky_10_repos + stackhpc_epel_10_repos + stackhpc_rocky_10_additional_repos + stackhpc_rocky_10_third_party_repos }}
319319
{% endif %}
320320
321321
stackhpc_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

etc/kayobe/kolla/kolla-build.conf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ base_tag = noble-20241118.1
77
apt_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
1316
rpm_setup_config =
1417
{% endif %}

0 commit comments

Comments
 (0)