From 52c7cc2352c5f6a3f7ff7b41ee4f120caf5dfdee Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 12 Nov 2024 21:26:59 -0800 Subject: [PATCH] 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] https://github.com/openstack/vitrage/blob/cf0749417192ecfa3a6c68c1d3f27f9e53b5a10d/devstack/upgrade/settings#L10 [2] https://github.com/openstack/vitrage/blob/cf0749417192ecfa3a6c68c1d3f27f9e53b5a10d/devstack/upgrade/settings#L10 [3] https://zuul.opendev.org/t/openstack/build/639acc47689d433a92bcb692c9fd1028/log/controller/logs/grenade.sh_log.txt#12498 Change-Id: If3693de2ed582b467856b0163a92a7e8fd2d138d --- .zuul.yaml | 11 +++++++---- devstack/upgrade/upgrade.sh | 2 +- setup.cfg | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 082be80f0..22499dd93 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -12,8 +12,6 @@ - vitrage-tempest-plugin-api-ipv6-only - vitrage-tempest-plugin-datasources - vitrage-grenade - - openstack-tox-py38 - - openstack-tox-py310 gate: jobs: @@ -21,8 +19,6 @@ - vitrage-tempest-plugin-api-ipv6-only - vitrage-tempest-plugin-datasources - vitrage-grenade - - openstack-tox-py38 - - openstack-tox-py310 - job: name: vitrage-grenade @@ -41,3 +37,10 @@ vars: devstack_plugins: 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 diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index e79523c44..884b08031 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -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" # 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" # Start Vitrage diff --git a/setup.cfg b/setup.cfg index 25469964b..9478af6f6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,7 @@ description_file = author = OpenStack author_email = openstack-discuss@lists.openstack.org home_page = https://docs.openstack.org/vitrage/latest/ -python_requires = >=3.8 +python_requires = >=3.9 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -17,10 +17,10 @@ classifier = Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: System :: Monitoring [extras]