Skip to content

use ark repos for R9 opensearch builds #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions etc/kayobe/environments/ci-builder/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treas
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"
stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}"
## Use derived vars from etc/kayobe/pulp.yml to switch between
## minor Rocky versions using stackhpc_pulp_repo_rocky_x_minor_version
stackhpc_repo_rocky_baseos_version: "{{ stackhpc_pulp_repo_rocky_8_baseos_version }}"
Expand Down
6 changes: 6 additions & 0 deletions etc/kayobe/kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,12 @@ stackhpc_rocky_9_third_party_repos:
- url: "{{ stackhpc_repo_rabbitmq_server_url }}"
file: "rabbitmq_rabbitmq-server.repo"
tag: "rabbitmq_rabbitmq-server"
- url: "{{ stackhpc_repo_opensearch_2_x_url }}"
file: "opensearch.repo"
tag: "opensearch-2.x"
- url: "{{ stackhpc_repo_opensearch_dashboards_2_x_url }}"
file: "opensearch.repo"
tag: "opensearch-dashboards-2.x"

# List of EPEL 9
stackhpc_epel_9_repos:
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/kolla/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ kayobe_image_tags:
cloudkitty_tag: yoga-20231107T165648
nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}"
neutron_tag: yoga-20231114T125927
opensearch_tag: yoga-20231219T221916

# These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag
glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
Expand Down
2 changes: 2 additions & 0 deletions etc/kayobe/pulp-repo-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ stackhpc_pulp_repo_epel_version: 20231020T014922
stackhpc_pulp_repo_grafana_version: 20231020T014922
stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20230815T010124
stackhpc_pulp_repo_mlnx_ofed_5_7_1_0_2_0_rhel8_6_version: 20220920T151419
stackhpc_pulp_repo_opensearch_2_x_version: 20231202T013234
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20231202T013234
stackhpc_pulp_repo_rabbitmq_erlang_version: 20231015T004919
stackhpc_pulp_repo_rabbitmq_server_version: 20231018T041416
stackhpc_pulp_repo_rhel_9_influxdb_version: 20231019T010143
Expand Down
12 changes: 12 additions & 0 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,18 @@ stackhpc_pulp_rpm_repos:
base_path: "influxdb/rhel/9/x86_64/stable/"
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"

- name: OpenSearch 2.x
url: "{{ stackhpc_release_pulp_content_url }}/opensearch/2.x/yum/{{ stackhpc_pulp_repo_opensearch_2_x_version }}"
distribution_name: "opensearch-2-x-"
base_path: "opensearch/2.x/yum/"
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"

- name: OpenSearch Dashboards 2.x
url: "{{ stackhpc_release_pulp_content_url }}/opensearch-dashboards/2.x/yum/{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}"
distribution_name: "opensearch-dashboards-2-x-"
base_path: "opensearch-dashboards/2.x/yum/"
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"

# RPM repositories
stackhpc_pulp_repository_rpm_repos: >-
{%- set rpm_repos = [] -%}
Expand Down
8 changes: 8 additions & 0 deletions etc/kayobe/stackhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,14 @@ stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_repo_distribution }}"
stackhpc_repo_rhel_9_influxdb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/influxdb/rhel/9/x86_64/stable/{{ stackhpc_repo_rhel_9_influxdb_version }}"
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_repo_distribution }}"

# OpenSearch for RHEL 9
stackhpc_repo_opensearch_2_x_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/opensearch/2.x/yum/{{ stackhpc_repo_opensearch_2_x_version }}"
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_repo_distribution }}"

# OpenSearch Dashboards for RHEL 9
stackhpc_repo_opensearch_dashboards_2_x_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/opensearch-dashboards/2.x/yum/{{ stackhpc_repo_opensearch_dashboards_2_x_version }}"
stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_repo_distribution }}"

# Rocky 9 AppStream
stackhpc_repo_rocky_9_appstream_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/AppStream/x86_64/os/{{ stackhpc_repo_rocky_9_appstream_version }}"
stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_repo_distribution }}"
Expand Down