backporting skyline disable

Author: seunghun1ee

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

@@ -29,7 +29,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
 
 ###############################################################################

etc/kayobe/kolla-image-tags.yml

@@ -4,74 +4,50 @@
 # where the key is the OS distro and the value is the tag to deploy.
 kolla_image_tags:
   openstack:
-    rocky-9: 2024.1-rocky-9-20241218T141751
+    rocky-9: 2024.1-rocky-9-20250704T120124
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
     ubuntu-noble: 2024.1-ubuntu-noble-20250404T150323
   bifrost:
-    rocky-9: 2024.1-rocky-9-20250325T141125
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250325T141125
   glance:
-    rocky-9: 2024.1-rocky-9-20250213T103134
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T103134
   horizon:
-    rocky-9: 2024.1-rocky-9-20250227T091118
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250227T091118
   ironic:
-    rocky-9: 2024.1-rocky-9-20250213T110505
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T110505
   ironic_dnsmasq:
-    rocky-9: 2024.1-rocky-9-20241218T141751
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
   ironic_prometheus_exporter:
-    rocky-9: 2024.1-rocky-9-20250124T081816
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250124T081816
   kolla_toolbox:
-    rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   magnum:
-    rocky-9: 2024.1-rocky-9-20250522T143506
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250522T143506
     ubuntu-noble: 2024.1-ubuntu-noble-20250522T143506
   manila:
-    rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   neutron:
-    rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   neutron_bgp_dragent:
-    rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   nova:
-    rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   octavia:
-    rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   openvswitch:
-    rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   ovn:
-    rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   prometheus:
     rocky-9: 2024.1-rocky-9-20250219T145255
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250219T145255
   prometheus_alertmanager:
-    rocky-9: 2024.1-rocky-9-20250422T103147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250422T103147
-  skyline_apiserver:
-    rocky-9: 2024.1-rocky-9-20250408T133253
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20250408T133253
-    ubuntu-noble: 2024.1-ubuntu-noble-20250415T123136
-  skyline_console:
-    rocky-9: 2024.1-rocky-9-20250408T133253
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20250408T133253
-    ubuntu-noble: 2024.1-ubuntu-noble-20250415T123136

etc/kayobe/kolla/kolla-build.conf

@@ -15,13 +15,12 @@ build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | jo
 [openstack-base]
 type = git
 location = https://github.com/stackhpc/requirements
-#reference = stackhpc/{{ openstack_release }}
-reference = rl9.6
+reference = stackhpc/{{ openstack_release }}
 
 [etcd]
 version = 3.5.21
 sha256 = amd64:adddda4b06718e68671ffabff2f8cee48488ba61ad82900e639d108f2148501c,arm64:95bf6918623a097c0385b96f139d90248614485e781ec9bee4768dbb6c79c53f
 
 [letsencrypt-lego]
 version = v4.23.1
-sha256 = amd64:1fd60b1fd59c239bed22719a5de402cb745d1f933540cb1ec196e2c03e6e8882,arm64:1114745108343286d4bff189b4bdee3cba9d07ebcacc673860d91ab951d31e0d
+sha256 = amd64:1fd60b1fd59c239bed22719a5de402cb745d1f933540cb1ec196e2c03e6e8882,arm64:1114745108343286d4bff189b4bdee3cba9d07ebcacc673860d91ab951d31e0d

etc/kayobe/pulp.yml

@@ -585,8 +585,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:

etc/kayobe/trivy/allowed-vulnerabilities.yml

@@ -16,8 +16,6 @@ fluentd_allowed_vulnerabilities:
   - CVE-2024-27280
 grafana_allowed_vulnerabilities:
   - CVE-2024-8986
-skyline_apiserver_allowed_vulnerabilities:
-  - CVE-2024-33663
 influxdb_allowed_vulnerabilities:
   - CVE-2024-45337
 magnum_conductor_allowed_vulnerabilities:

releasenotes/notes/drop-skyline-support-31d683f58f125335.yaml

@@ -0,0 +1,4 @@
+---
+deprecations:
+  - |
+    Disabled building of Kolla container images for Skyline