Skip to content

Commit 370a216

Browse files
Alex-WelshAlex-Welsh
committed
2025.1 Fix kayobe container image builds & pin OVS
1 parent 7ef68e5 commit 370a216

File tree

12 files changed

+125
-54
lines changed

12 files changed

+125
-54
lines changed

‎.automation‎

‎.github/workflows/stackhpc-pull-request.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ jobs:
109109
# when the parent jobs completed successfully or were skipped. We pass an
110110
# 'if' argument to the called workflow to allow running it conditionally.
111111

112-
# build-kayobe-image:
113-
# name: Build Kayobe Image
114-
# needs:
115-
# - check-changes
116-
# uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
117-
# with:
118-
# if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
119-
# if: github.repository == 'stackhpc/stackhpc-kayobe-config'
112+
build-kayobe-image:
113+
name: Build Kayobe Image
114+
needs:
115+
- check-changes
116+
uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
117+
with:
118+
if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
119+
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
120120

121121
# check-tags:
122122
# name: Check container image tags

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
3030
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
3131
stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
3232
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
33+
stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
3334
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
3435
stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
3536
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
5656
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
5757
stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
5858
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
59+
stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
5960
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
6061
stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
6162
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
3030
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
3131
stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
3232
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
33+
stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
3334
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
3435
stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
3536
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

‎etc/kayobe/kolla.yml‎

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -134,24 +134,14 @@ kolla_sources:
134134
type: git
135135
location: https://github.com/stackhpc/magnum.git
136136
reference: stackhpc/{{ openstack_release }}
137-
neutron-base-plugin-networking-generic-switch:
138-
type: git
139-
location: https://github.com/stackhpc/networking-generic-switch.git
140-
reference: stackhpc/{{ openstack_release }}
141-
# FIXME: check whether we want to build from upstream master of a downstream
142-
# 2025.1 branch e.g.
143-
# location: https://github.com/stackhpc/networking-mlnx.git
144-
# reference: stackhpc/{{ openstack_release }}
145137
neutron-server-plugin-networking-mlnx:
146138
type: git
147-
location: https://opendev.org/x/networking-mlnx
148-
reference: master
139+
location: https://github.com/stackhpc/networking-mlnx.git
140+
reference: stackhpc/{{ openstack_release }}
149141
nova-compute-plugin-networking-mlnx:
150142
type: git
151-
location: https://opendev.org/x/networking-mlnx
152-
reference: master
153-
# FIXME: Check whether we want to build from downstream stackhpc/master,
154-
# stackhpc/2025.1, or upstream epoxy or master
143+
location: https://github.com/stackhpc/networking-mlnx.git
144+
reference: stackhpc/{{ openstack_release }}
155145
blazar-base:
156146
type: git
157147
location: https://github.com/stackhpc/blazar.git
@@ -177,6 +167,11 @@ stackhpc_rocky_9_additional_repos:
177167
- url: "{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_url }}"
178168
file: "CentOS-NFV-OpenvSwitch.repo"
179169
tag: "centos-nfv-openvswitch"
170+
# TODO: uncomment once https://review.opendev.org/c/openstack/kolla/+/948520
171+
# or equivalent is merged
172+
# - url: "{{ stackhpc_repo_centos_stream_9_openstack_epoxy_url }}"
173+
# file: "CentOS-OpenStack-epoxy.repo"
174+
# tag: "centos-openstack-epoxy"
180175
- url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}"
181176
file: "CentOS-OpsTools.repo"
182177
tag: "centos-opstools"
@@ -360,7 +355,6 @@ kolla_build_customizations_common:
360355
- python3-ethtool
361356
neutron_mlnx_agent_pip_packages_override:
362357
- networking-mlnx@git+https://opendev.org/x/networking-mlnx@master
363-
364358
kolla_build_customizations_rocky:
365359
base_centos_yum_repo_packages_append:
366360
- centos-release-ceph-squid
@@ -369,6 +363,10 @@ kolla_build_customizations_rocky:
369363
base_centos_yum_repos_to_disable_remove:
370364
- centos-ceph-reef
371365
- epel
366+
- centos9-nfv-ovs
367+
- centos9-opstools
368+
- centos9-rabbitmq
369+
- centos9-storage
372370
kolla_toolbox_packages_remove:
373371
- openvswitch
374372
kolla_toolbox_packages_append:
@@ -389,6 +387,8 @@ kolla_build_customizations_rocky:
389387
nova_base_packages_append:
390388
- openvswitch3.3
391389
- python3-openvswitch3.3
390+
nova_libvirt_packages_remove:
391+
- openvswitch
392392
octavia_base_packages_remove:
393393
- python3-openvswitch
394394
openvswitch_base_packages_remove:
@@ -408,7 +408,55 @@ kolla_build_customizations_rocky:
408408
ovn_sb_db_server_packages_override:
409409
- ovn24.03-central
410410

411-
kolla_build_customizations_ubuntu: {}
411+
kolla_build_customizations_ubuntu:
412+
kolla_toolbox_packages_remove:
413+
- openvswitch-switch
414+
- openvswitch-common
415+
kolla_toolbox_packages_append:
416+
- openvswitch-switch=3.3.0-1ubuntu3.2
417+
- openvswitch-common=3.3.0-1ubuntu3.2
418+
manila_base_packages_remove:
419+
- openvswitch-switch
420+
- openvswitch-common
421+
manila_base_packages_append:
422+
- openvswitch-switch=3.3.0-1ubuntu3.2
423+
- openvswitch-common=3.3.0-1ubuntu3.2
424+
neutron_base_packages_remove:
425+
- openvswitch-switch
426+
- openvswitch-common
427+
- python3-openvswitch
428+
neutron_base_packages_append:
429+
- openvswitch-switch=3.3.0-1ubuntu3.2
430+
- openvswitch-common=3.3.0-1ubuntu3.2
431+
- python3-openvswitch=3.3.0-1ubuntu3.2
432+
nova_base_packages_remove:
433+
- openvswitch-switch
434+
- openvswitch-common
435+
- python3-openvswitch
436+
nova_base_packages_append:
437+
- openvswitch-switch=3.3.0-1ubuntu3.2
438+
- openvswitch-common=3.3.0-1ubuntu3.2
439+
- python3-openvswitch=3.3.0-1ubuntu3.2
440+
nova_libvirt_packages_remove:
441+
- openvswitch-switch
442+
- openvswitch-common
443+
nova_libvirt_packages_append:
444+
- openvswitch-switch=3.3.0-1ubuntu3.2
445+
- openvswitch-common=3.3.0-1ubuntu3.2
446+
openvswitch_base_packages_remove:
447+
- openvswitch-switch
448+
- openvswitch-common
449+
- python3-openvswitch
450+
openvswitch_base_packages_append:
451+
- openvswitch-switch=3.3.0-1ubuntu3.2
452+
- openvswitch-common=3.3.0-1ubuntu3.2
453+
- python3-openvswitch=3.3.0-1ubuntu3.2
454+
ovs_dpdk_packages_remove:
455+
- openvswitch-switch
456+
- openvswitch-common-dpdk
457+
ovs_dpdk_packages_append:
458+
- openvswitch-switch-dpdk=3.3.0-1ubuntu3.2
459+
412460

413461
# Dict mapping image customization variable names to their values.
414462
# Each variable takes the form:

‎etc/kayobe/kolla/kolla-build.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ base_tag = noble-20241118.1
77
{# Similarly pinning to Rocky 9 minor version used in our repos #}
88
{% elif kolla_base_distro == 'rocky' %}
99
base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
10+
rpm_setup_config =
1011
{% endif %}
1112
build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | join(',') }}
1213

‎etc/kayobe/pulp-repo-versions.yml‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
---
22
# This file is autogenerated by Ansible using the following workflow:
33
# https://github.com/stackhpc/stackhpc-release-train/actions/workflows/package-update-kayobe.yml
4-
stackhpc_pulp_repo_centos_stream_9_docker_version: 20250123T000657
5-
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20250205T015600
4+
stackhpc_pulp_repo_centos_stream_9_docker_version: 20250423T095148
5+
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20250521T021940
6+
stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version: 20250521T021940
67
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
7-
stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20250203T100829
8-
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250131T133101
9-
stackhpc_pulp_repo_elrepo_9_version: 20250203T000038
10-
stackhpc_pulp_repo_epel_9_version: 20250204T071808
11-
stackhpc_pulp_repo_grafana_version: 20250204T090817
12-
stackhpc_pulp_repo_opensearch_2_x_version: 20241106T010702
13-
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20241106T010702
14-
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250128T001826
15-
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20241217T002152
16-
stackhpc_pulp_repo_rhel_9_influxdb_version: 20250125T002237
17-
stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20250205T001351
8+
stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20250412T024303
9+
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250520T001722
10+
stackhpc_pulp_repo_elrepo_9_version: 20250520T000105
11+
stackhpc_pulp_repo_epel_9_version: 20250521T000033
12+
stackhpc_pulp_repo_grafana_version: 20250520T005212
13+
stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
14+
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
15+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250510T003301
16+
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250415T235053
17+
stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
18+
stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
19+
stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
20+
stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
21+
stackhpc_pulp_repo_rhel_9_influxdb_version: 20250520T003433
22+
stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20250510T003301
1823
stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
1924
stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
20-
stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20241115T002028
25+
stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20250516T002449
2126
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
2227
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
2328
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328
@@ -38,16 +43,12 @@ stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240816T002610
3843
stackhpc_pulp_repo_rocky_9_4_crb_version: 20240816T002610
3944
stackhpc_pulp_repo_rocky_9_4_extras_version: 20240816T002610
4045
stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240816T002610
41-
stackhpc_pulp_repo_rocky_9_5_appstream_version: 20250202T120931
42-
stackhpc_pulp_repo_rocky_9_5_baseos_version: 20250201T125442
43-
stackhpc_pulp_repo_rocky_9_5_crb_version: 20250204T095037
44-
stackhpc_pulp_repo_rocky_9_5_extras_version: 20250122T025402
45-
stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20250204T095037
46-
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20250128T024400
47-
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250205T050034
48-
stackhpc_pulp_repo_ubuntu_noble_security_version: 20250205T090140
49-
stackhpc_pulp_repo_ubuntu_noble_version: 20250205T090140
50-
stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
51-
stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
52-
stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
53-
stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
46+
stackhpc_pulp_repo_rocky_9_5_appstream_version: 20250514T014704
47+
stackhpc_pulp_repo_rocky_9_5_baseos_version: 20250513T031844
48+
stackhpc_pulp_repo_rocky_9_5_crb_version: 20250514T014704
49+
stackhpc_pulp_repo_rocky_9_5_extras_version: 20250506T032818
50+
stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20250426T024332
51+
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20250222T040303
52+
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250521T051707
53+
stackhpc_pulp_repo_ubuntu_noble_security_version: 20250521T092424
54+
stackhpc_pulp_repo_ubuntu_noble_version: 20250521T092424

‎etc/kayobe/pulp.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,12 @@ stackhpc_pulp_rpm_repos:
285285
base_path: "centos/9-stream/nfv/x86_64/openvswitch-2/"
286286
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
287287

288+
- name: CentOS Stream 9 - OpenStack Epoxy
289+
url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-epoxy/{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
290+
distribution_name: "centos-stream-9-openstack-epoxy-"
291+
base_path: "centos/9-stream/cloud/x86_64/openstack-epoxy/"
292+
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
293+
288294
- name: CentOS 9 - OpsTools - collectd
289295
url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
290296
distribution_name: "centos-9-opstools-collectd-"

‎etc/kayobe/stackhpc.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
6868
stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
6969
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
7070

71+
# CentOS Stream 9 - OpenStack Epoxy
72+
stackhpc_repo_centos_stream_9_openstack_epoxy_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/cloud/x86_64/openstack-epoxy/{{ stackhpc_repo_centos_stream_9_openstack_epoxy_version }}"
73+
stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_repo_distribution }}"
74+
7175
# CentOS Stream 9 - NFV OpenvSwitch
7276
stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"
7377
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
@@ -141,7 +145,10 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
141145

142146
# Kolla source repository.
143147
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
144-
stackhpc_kolla_source_version: stackhpc/20.0.0.3
148+
# FIXME: Go back to normal tags once
149+
# https://review.opendev.org/c/openstack/kolla/+/951871 is merged and synced
150+
# downstream
151+
stackhpc_kolla_source_version: epoxy-test-alex
145152

146153
# Kolla Ansible source repository.
147154
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"

0 commit comments

Comments
 (0)