Skip to content

Commit cf53e9d

Browse files
authored
Merge pull request #485 from stackhpc/upstream/2024.1-2025-11-03
Synchronise 2024.1 with upstream
2 parents 5fc66d9 + 2c31403 commit cf53e9d

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

.zuul.d/debian.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,10 @@
1414
- kolla-build-debian
1515
- kolla-build-debian-podman
1616
- kolla-ansible-debian
17-
periodic:
17+
periodic-stable:
1818
jobs:
1919
- kolla-publish-debian-quay
2020
- kolla-publish-debian-aarch64-quay
21-
periodic-weekly:
22-
jobs:
23-
- kolla-publish-debian-dockerhub
24-
- kolla-publish-debian-aarch64-dockerhub
2521
experimental:
2622
jobs:
2723
- kolla-build-no-infra-wheels-debian

.zuul.d/rocky.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@
3333
- kolla-build-rocky9
3434
- kolla-build-rocky9-podman
3535
- kolla-ansible-rocky9
36-
periodic:
36+
periodic-stable:
3737
jobs:
3838
- kolla-publish-rocky9-quay
39-
periodic-weekly:
40-
jobs:
41-
- kolla-publish-rocky9-dockerhub
4239
experimental:
4340
jobs:
4441
- kolla-build-no-infra-wheels-rocky9

.zuul.d/ubuntu.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,10 @@
3737
- kolla-build-ubuntu-jammy-podman
3838
- kolla-build-ubuntu-noble-podman
3939
- kolla-ansible-ubuntu
40-
periodic:
40+
periodic-stable:
4141
jobs:
4242
- kolla-publish-ubuntu-jammy-quay
4343
- kolla-publish-ubuntu-noble-quay
44-
periodic-weekly:
45-
jobs:
46-
- kolla-publish-ubuntu-jammy-dockerhub
4744
experimental:
4845
jobs:
4946
- kolla-build-no-infra-wheels-ubuntu

docker/horizon/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
5050
# because we are using different distros with different python version and we need to
5151
# know to which path symlink should point to.
5252
RUN ln -s horizon-source/* horizon \
53+
&& {{ macros.install_pip(['pip==25.2.*']) }} \
5354
&& {{ macros.upper_constraints_remove("horizon") }} \
5455
&& {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \
5556
&& mkdir -p /etc/openstack-dashboard \

0 commit comments

Comments
 (0)