Multiple fixes: grenade job fix and python 3.8 drop

1. Enable the vitrage services on grenade target node

Grenade job need services to be enabled on base as well
as target node. Vitrage upgrade/setting file do enable the
vitrage services for target node[1] but those are only for
the case where grenade install the devstack[2]. Our CI
have devstack installed ready foer grenade(
GRENADE_USE_EXTERNAL_DEVSTACK=True) and because of that
vitrage grenade target node see vitrage services are not enabled[3]

To fix that we need to enable all the required services
on job definition.

2. grenade has enabled the GLOBAL_VENV by default and vitrage
grenade job needs to install and run everything from venv. This
fixes the vitrage bin directory locaiton otherwise it will fail
with below error
- https://zuul.opendev.org/t/openstack/build/cc87495cade64928a414ba26a4e53af1/log/controller/logs/grenade.sh_log.txt#12870

3. This drop the python 3.8 support. Removing the python 3.10
tox job from pipeline as that is running from generic template.

[1] cf07494171/devstack/upgrade/settings (L10)
[2] cf07494171/devstack/upgrade/settings (L10)
[3] https://zuul.opendev.org/t/openstack/build/639acc47689d433a92bcb692c9fd1028/log/controller/logs/grenade.sh_log.txt#12498

Change-Id: If3693de2ed582b467856b0163a92a7e8fd2d138d
This commit is contained in:
Ghanshyam Mann 2024-11-12 21:26:59 -08:00
parent cf07494171
commit 52c7cc2352
3 changed files with 10 additions and 7 deletions

View File

@ -12,8 +12,6 @@
- vitrage-tempest-plugin-api-ipv6-only - vitrage-tempest-plugin-api-ipv6-only
- vitrage-tempest-plugin-datasources - vitrage-tempest-plugin-datasources
- vitrage-grenade - vitrage-grenade
- openstack-tox-py38
- openstack-tox-py310
gate: gate:
jobs: jobs:
@ -21,8 +19,6 @@
- vitrage-tempest-plugin-api-ipv6-only - vitrage-tempest-plugin-api-ipv6-only
- vitrage-tempest-plugin-datasources - vitrage-tempest-plugin-datasources
- vitrage-grenade - vitrage-grenade
- openstack-tox-py38
- openstack-tox-py310
- job: - job:
name: vitrage-grenade name: vitrage-grenade
@ -41,3 +37,10 @@
vars: vars:
devstack_plugins: devstack_plugins:
vitrage: https://opendev.org/openstack/vitrage vitrage: https://opendev.org/openstack/vitrage
devstack_services:
vitrage-api: true
vitrage-graph: true
vitrage-notifier: true
vitrage-ml: true
vitrage-persistor: true
vitrage-snmp-parsing: true

View File

@ -82,7 +82,7 @@ upgrade_project vitrage $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH
write_uwsgi_config "$VITRAGE_UWSGI_FILE" "$VITRAGE_PUBLIC_UWSGI" "/rca" write_uwsgi_config "$VITRAGE_UWSGI_FILE" "$VITRAGE_PUBLIC_UWSGI" "/rca"
# Simulate init_vitrage() # Simulate init_vitrage()
VITRAGE_BIN_DIR=$(dirname $(which vitrage-dbsync)) VITRAGE_BIN_DIR=$(get_python_exec_prefix)
$VITRAGE_BIN_DIR/vitrage-dbsync --config-file $VITRAGE_CONF || die $LINENO "DB sync error" $VITRAGE_BIN_DIR/vitrage-dbsync --config-file $VITRAGE_CONF || die $LINENO "DB sync error"
# Start Vitrage # Start Vitrage

View File

@ -6,7 +6,7 @@ description_file =
author = OpenStack author = OpenStack
author_email = openstack-discuss@lists.openstack.org author_email = openstack-discuss@lists.openstack.org
home_page = https://docs.openstack.org/vitrage/latest/ home_page = https://docs.openstack.org/vitrage/latest/
python_requires = >=3.8 python_requires = >=3.9
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
@ -17,10 +17,10 @@ classifier =
Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Topic :: System :: Monitoring Topic :: System :: Monitoring
[extras] [extras]