Skip to content

Commit e8aec31

Browse files
committed
Update rpm repos to match Caracal
1 parent ecf1659 commit e8aec31

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_
3838
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
3939
stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
4040
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
41-
stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
42-
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
41+
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
42+
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
4343
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
4444
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
4545
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_
5858
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
5959
stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
6060
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
61-
stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
62-
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
61+
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
62+
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
6363
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
6464
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
6565
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_
3535
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
3636
stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
3737
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
38-
stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
39-
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
38+
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
39+
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
4040
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
4141
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
4242
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"

etc/kayobe/pulp.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,16 @@ stackhpc_pulp_rpm_repos:
237237
base_path: "grafana/oss/rpm/"
238238
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
239239

240-
- name: RabbitMQ - Erlang
241-
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
242-
distribution_name: "rabbitmq-erlang-"
243-
base_path: "rabbitmq/erlang/el/8/x86_64/"
240+
- name: RabbitMQ - Erlang - RHEL 9
241+
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
242+
distribution_name: "rhel9-rabbitmq-erlang-"
243+
base_path: "rabbitmq/erlang/el/9/x86_64/"
244244
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
245245

246-
- name: RabbitMQ - Server
247-
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
248-
distribution_name: "rabbitmq-server-"
249-
base_path: "rabbitmq/rabbitmq-server/el/8/x86_64/"
246+
- name: RabbitMQ - Server - RHEL 9
247+
url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
248+
distribution_name: "rhel9-rabbitmq-server-"
249+
base_path: "rabbitmq/rabbitmq-server/el/9/x86_64/"
250250
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
251251

252252
# Base Rocky 9 repositories
@@ -335,16 +335,16 @@ stackhpc_pulp_rpm_repos:
335335
required: "{{ stackhpc_pulp_sync_el_9 | bool }}"
336336

337337
# Additional RHEL 9 repositories
338-
- name: TreasureData 4 for RHEL 9
339-
url: "{{ stackhpc_release_pulp_content_url }}/treasuredata/4/redhat/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
340-
distribution_name: "rhel-9-treasuredata-4-"
341-
base_path: "treasuredata/4/redhat/9/x86_64/"
338+
- name: TreasureData 5 for RHEL 9
339+
url: "{{ stackhpc_release_pulp_content_url }}/treasuredata/4/redhat/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
340+
distribution_name: "rhel-9-treasuredata-5-"
341+
base_path: "treasuredata/5/redhat/9/x86_64/"
342342
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
343343

344-
- name: MariaDB 10.6 for RHEL 9
345-
url: "{{ stackhpc_release_pulp_content_url }}/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
346-
distribution_name: "rhel-9-mariadb-10-6-"
347-
base_path: "mariadb-10.6/yum/rhel/9/x86_64/"
344+
- name: MariaDB 10.11 for RHEL 9
345+
url: "{{ stackhpc_release_pulp_content_url }}/mariadb-10.11/yum/rhel/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
346+
distribution_name: "rhel-9-mariadb-10-11-"
347+
base_path: "mariadb-10.11/yum/rhel/9/x86_64/"
348348
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
349349

350350
- name: InfluxDB for RHEL 9

etc/kayobe/stackhpc.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_repo_distribution }}"
5656
stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/oss/rpm/{{ stackhpc_repo_grafana_version }}"
5757
stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
5858

59-
# RabbitMQ - Erlang for Redhat family, version 8/9 agnostic
60-
stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
59+
# RabbitMQ - Erlang for RHEL 9
60+
stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_version }}"
6161
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
6262

63-
# RabbitMQ for Redhat family, version 8/9 agnostic
64-
stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_repo_rabbitmq_server_version }}"
63+
# RabbitMQ for RHEL 9
64+
stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
6565
stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
6666

6767
# CentOS Stream 9 - NFV OpenvSwitch
@@ -85,12 +85,12 @@ stackhpc_repo_centos_stream_9_docker_url: "{{ stackhpc_repo_mirror_url }}/pulp/c
8585
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_repo_distribution }}"
8686

8787
# TreasureData 4 for RHEL 9
88-
stackhpc_repo_rhel_9_treasuredata_4_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/4/redhat/9/x86_64/{{ stackhpc_repo_rhel_9_treasuredata_4_version }}"
89-
stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_repo_distribution }}"
88+
stackhpc_repo_rhel_9_treasuredata_5_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/5/redhat/9/x86_64/{{ stackhpc_repo_rhel_9_treasuredata_5_version }}"
89+
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_repo_distribution }}"
9090

9191
# MariaDB 10.6 for RHEL 9
92-
stackhpc_repo_rhel_9_mariadb_10_6_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_repo_rhel_9_mariadb_10_6_version }}"
93-
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_repo_distribution }}"
92+
stackhpc_repo_rhel_9_mariadb_10_11_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.6/yum/rhel/9/x86_64/{{ stackhpc_repo_rhel_9_mariadb_10_11_version }}"
93+
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_repo_distribution }}"
9494

9595
# InfluxDB for RHEL 9
9696
stackhpc_repo_rhel_9_influxdb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/influxdb/rhel/9/x86_64/stable/{{ stackhpc_repo_rhel_9_influxdb_version }}"

0 commit comments

Comments
 (0)