diff options
| -rw-r--r-- | docker/aodh/aodh-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 1 | ||||
| -rw-r--r-- | zuul.d/scenarios/telemetry.yaml | 13 |
3 files changed, 15 insertions, 4 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 39e785dc8..7f68c5071 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -13,7 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }} -RUN mkdir -p /var/www/cgi-bin/aodh ADD aodh-base-archive /aodh-base-source @@ -26,13 +25,11 @@ COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers RUN ln -s aodh-base-source/* aodh \ && {{ macros.install_pip(aodh_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/aodh /var/www/cgi-bin/aodh \ - && cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \ + && mkdir -p /etc/aodh \ && cp /aodh/aodh/api/api-paste.ini /etc/aodh/ \ && chmod 644 /etc/aodh/api-paste.ini \ && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \ - && chmod 755 /var/www/cgi-bin/aodh \ && touch /usr/local/bin/kolla_aodh_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index f8652aaf7..bc7d58876 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -19,6 +19,7 @@ - kolla-scenario-masakari - kolla-scenario-octavia - kolla-scenario-ovn + - kolla-scenario-telemetry - kolla-tox-genconfig - openstack-python3-jobs - openstack-python3-jobs-arm64 diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml new file mode 100644 index 000000000..ef90c34af --- /dev/null +++ b/zuul.d/scenarios/telemetry.yaml @@ -0,0 +1,13 @@ +--- +- project-template: + name: kolla-scenario-telemetry + description: | + Runs Kolla-Ansible Telemetry scenario jobs on particular Kolla changes. + check: + jobs: + - kolla-ansible-debian-trixie-telemetry: + files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.* + - kolla-ansible-rocky-10-telemetry: + files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.* + - kolla-ansible-ubuntu-noble-telemetry: + files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.* |