From 4b8256d186ed600c83579669b82ca97c33daad29 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 10 Jun 2025 14:27:08 +0100 Subject: [PATCH] Disable Skyline build --- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 1 - etc/kayobe/pulp.yml | 2 -- etc/kayobe/trivy/allowed-vulnerabilities.yml | 3 --- .../notes/drop-skyline-support-31d683f58f125335.yaml | 4 ++++ .../notes/enable-building-skyline-61a41c13cfcd54a1.yaml | 5 ----- 5 files changed, 4 insertions(+), 11 deletions(-) create mode 100644 releasenotes/notes/drop-skyline-support-31d683f58f125335.yaml delete mode 100644 releasenotes/notes/enable-building-skyline-61a41c13cfcd54a1.yaml diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 0cdd49bd2..755804d86 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -28,7 +28,6 @@ kolla_enable_octavia: true kolla_enable_opensearch: true kolla_enable_prometheus: true kolla_enable_redis: true -kolla_enable_skyline: true kolla_build_neutron_ovs: true ############################################################################### diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 42604100f..12feb9fc1 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -531,8 +531,6 @@ stackhpc_pulp_images_kolla: - rabbitmq - redis - redis-sentinel - - skyline-apiserver - - skyline-console # List of images for each base distribution which should not/cannot be built. stackhpc_kolla_unbuildable_images: diff --git a/etc/kayobe/trivy/allowed-vulnerabilities.yml b/etc/kayobe/trivy/allowed-vulnerabilities.yml index caf8c7021..adf2aad82 100644 --- a/etc/kayobe/trivy/allowed-vulnerabilities.yml +++ b/etc/kayobe/trivy/allowed-vulnerabilities.yml @@ -36,9 +36,6 @@ prometheus_cadvisor_allowed_vulnerabilities: - CVE-2024-41110 - CVE-2024-45337 -skyline_apiserver_allowed_vulnerabilities: - - CVE-2024-33663 - ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/releasenotes/notes/drop-skyline-support-31d683f58f125335.yaml b/releasenotes/notes/drop-skyline-support-31d683f58f125335.yaml new file mode 100644 index 000000000..60541ce0c --- /dev/null +++ b/releasenotes/notes/drop-skyline-support-31d683f58f125335.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + Disabled building of Kolla container images for Skyline diff --git a/releasenotes/notes/enable-building-skyline-61a41c13cfcd54a1.yaml b/releasenotes/notes/enable-building-skyline-61a41c13cfcd54a1.yaml deleted file mode 100644 index 681c338e6..000000000 --- a/releasenotes/notes/enable-building-skyline-61a41c13cfcd54a1.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -features: - - | - Enable building of ``Skyline`` an alternative to ``Horizon``. -