Skip to content

Commit 0c436f1

Browse files
authored
Fix RHEL 9 aarch64 DOCA repo version (#2300)
RHEL 9 DOCA x86 and aarch64 use the same timestamp, but promotion needs a version key for each repo. Add the missing aarch64 key.
1 parent c878966 commit 0c436f1

3 files changed

Lines changed: 4 additions & 1 deletion

File tree

etc/kayobe/ofed.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ stackhpc_pulp_sync_ofed: "{{ groups['mlnx'] | length > 0 }}"
2323
doca_rocky_9_minor_dot: "{% if stackhpc_pulp_doca_version is version('3.2.0', '>=') %}9{% else %}9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}{% endif %}"
2424
# eg stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version or stackhpc_pulp_repo_doca_3_2_2_rhel9_version
2525
doca_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel{{ doca_rocky_9_minor_dot | replace('.', '_') }}_version"
26+
doca_aarch64_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel{{ doca_rocky_9_minor_dot | replace('.', '_') }}_aarch64_version"
2627
doca_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_version"
2728
doca_modules_aarch64_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_aarch64_version"
2829

2930
# DOCA Snapshot versions. The defaults use the appropriate version from
3031
# pulp-repo-versions.yml
3132
stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', doca_version_lookup_var) }}"
33+
stackhpc_pulp_repo_rhel9_doca_aarch64_version: "{{ lookup('vars', doca_aarch64_version_lookup_var, default=stackhpc_pulp_repo_rhel9_doca_version) }}"
3234
stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', doca_modules_version_lookup_var) }}"
3335
stackhpc_pulp_repo_rhel9_doca_modules_aarch64_version: "{{ lookup('vars', doca_modules_aarch64_version_lookup_var) }}"
3436

etc/kayobe/pulp-repo-versions.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ stackhpc_pulp_repo_doca_3_2_2_rhel10_aarch64_version: 20260326T091359
3030
stackhpc_pulp_repo_doca_3_2_2_rhel10_x86_64_version: 20260326T091359
3131
stackhpc_pulp_repo_doca_3_2_2_rhel9_7_modules_aarch64_version: 20260424T151043
3232
stackhpc_pulp_repo_doca_3_2_2_rhel9_7_modules_version: 20260424T151043
33+
stackhpc_pulp_repo_doca_3_2_2_rhel9_aarch64_version: 20260326T091359
3334
stackhpc_pulp_repo_doca_3_2_2_rhel9_version: 20260326T091359
3435
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20260402T202840
3536
stackhpc_pulp_repo_elrepo_10_aarch64_version: 20260220T152827

etc/kayobe/pulp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ stackhpc_pulp_rpm_repos:
420420
required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_9 | bool }}"
421421

422422
- name: DOCA Online Repo {{ stackhpc_pulp_doca_version }} - RHEL {{ doca_rocky_9_minor_dot }} aarch64
423-
url: "{{ stackhpc_release_pulp_content_url }}/doca/{{ stackhpc_pulp_doca_version }}/rhel{{ doca_rocky_9_minor_dot }}/aarch64/{{ stackhpc_pulp_repo_rhel9_doca_version }}"
423+
url: "{{ stackhpc_release_pulp_content_url }}/doca/{{ stackhpc_pulp_doca_version }}/rhel{{ doca_rocky_9_minor_dot }}/aarch64/{{ stackhpc_pulp_repo_rhel9_doca_aarch64_version }}"
424424
distribution_name: "doca-{{ stackhpc_pulp_doca_version }}-rhel{{ doca_rocky_9_minor_dot }}-aarch64-"
425425
base_path: "doca/{{ stackhpc_pulp_doca_version }}/rhel{{ doca_rocky_9_minor_dot }}/aarch64/"
426426
required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_9 | bool }}"

0 commit comments

Comments
 (0)