From 62b8b2a3e88e279c663c20dfffc244d62555110d Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 18 Sep 2025 03:46:35 +0000 Subject: [PATCH] Openstack 2025.1 Epoxy support Change-Id: I303ad9120466d7f3376adaa040dcb18d96894822 Signed-off-by: Sergiy Markin --- .zuul.yaml | 2 + requirements-direct.txt | 52 ++++++++++++------------- requirements-frozen.txt | 84 +++++++++++++++++++++-------------------- vcs-requirements.env | 6 +-- 4 files changed, 75 insertions(+), 69 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 1dcc1300..48bd6e1f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -131,6 +131,8 @@ CLONE_PEGLEG: false MAKE_PEGLEG_IMAGES: true USE_ARMADA_GO: false + DISTRO: ubuntu_jammy + DOCKER_REGISTRY: localhost:5000 gate_scripts_relative_path: ../../airship/treasuremap gate_scripts: - ./tools/deployment/airskiff/developer/000-clone-dependencies.sh diff --git a/requirements-direct.txt b/requirements-direct.txt index 77ac2b7f..b3b91761 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -11,34 +11,34 @@ psycopg2-binary pytz # Airship dependencies -deckhand @ git+https://opendev.org/airship/deckhand.git@d8cc9f3ed2c9f2b9d9bf271a72c9bf301f16f647#egg=deckhand -shipyard-client @ git+https://opendev.org/airship/shipyard.git@95b37b822eaf8ad39c644f7007b2c1a07293e5ab#egg=shipyard-client&subdirectory=src/bin/shipyard_client -promenade @ git+https://opendev.org/airship/promenade.git@84189ac1cae841529ca27aa2ad4a6568e3bbcc64#egg=promenade +deckhand @ git+https://opendev.org/airship/deckhand.git@1da4b273a5e1160008e819b27faa7650f2defab5#egg=deckhand +shipyard-client @ git+https://opendev.org/airship/shipyard.git@7ba581dc5d4b854ca06128b29a711393edda6bb6#egg=shipyard-client&subdirectory=src/bin/shipyard_client +promenade @ git+https://opendev.org/airship/promenade.git@4e3e541f5ebd40aea4d25391e646242698493654#egg=promenade -# Openstack Caracal 2024.1 -# https://releases.openstack.org/caracal/index.html -barbican==18.0.0 +# Openstack Epoxy 2025.1 +# https://releases.openstack.org/epoxy/index.html +barbican==20.0.0 -python-barbicanclient==5.7.0 -python-keystoneclient==5.4.0 +python-barbicanclient==7.1.0 +python-keystoneclient==5.6.0 -keystoneauth1==5.6.0 -keystonemiddleware==10.6.0 +keystoneauth1==5.10.0 +keystonemiddleware==10.9.0 -oslo.cache==3.7.0 -oslo.concurrency==6.0.0 -oslo.config==9.4.0 -oslo.context==5.5.0 -oslo.db==15.0.0 -oslo.i18n==6.3.0 -oslo.log==5.5.1 -oslo.messaging==14.7.2 -oslo.metrics==0.8.0 -oslo.middleware==6.1.0 -oslo.policy==4.3.0 -oslo.serialization==5.4.1 -oslo.service==3.4.1 -oslo.upgradecheck==2.3.0 -oslo.utils==7.1.0 -oslo.versionedobjects==3.3.0 +oslo.cache==3.10.2 +oslo.concurrency==7.1.0 +oslo.config==9.7.1 +oslo.context==5.7.1 +oslo.db==17.2.1 +oslo.i18n==6.5.1 +oslo.log==7.1.0 +oslo.messaging==16.1.0 +oslo.metrics==0.11.0 +oslo.middleware==6.3.1 +oslo.policy==4.5.1 +oslo.serialization==5.7.0 +oslo.service==4.1.1 +oslo.upgradecheck==2.5.0 +oslo.utils==8.2.0 +oslo.versionedobjects==3.6.0 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 9107771a..969d5d8d 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -3,33 +3,33 @@ amqp==5.3.1 arrow==1.3.0 attrs==25.3.0 autopage==0.5.2 -barbican==18.0.0 +barbican==20.0.0 bcrypt==4.3.0 Beaker==1.13.0 cachetools==5.5.2 -castellan==5.3.0 +castellan==5.4.1 certifi==2025.4.26 cffi==1.17.1 charset-normalizer==3.4.2 click==8.2.1 click-default-group==1.2.4 -cliff==4.10.0 -cmd2==2.6.1 +cliff==4.11.0 +cmd2==2.7.0 cryptography==42.0.8 debtcollector==3.0.0 -Deckhand @ git+https://opendev.org/airship/deckhand.git@d8cc9f3ed2c9f2b9d9bf271a72c9bf301f16f647 +Deckhand @ git+https://opendev.org/airship/deckhand.git@1da4b273a5e1160008e819b27faa7650f2defab5 decorator==5.2.1 -deepdiff==8.5.0 +deepdiff==8.6.1 dnspython==2.7.0 docker==7.1.0 -dogpile.cache==1.4.0 +dogpile.cache==1.4.1 durationpy==0.10 eventlet==0.40.0 -falcon==4.0.2 +falcon==4.1.0 fasteners==0.19 -fixtures==4.2.5 +fixtures==4.2.6 Flask==2.2.5 -futurist==3.1.1 +futurist==3.2.1 gitdb==4.0.12 GitPython==3.1.44 google-auth==2.40.2 @@ -44,62 +44,64 @@ jsonpath-ng==1.7.0 jsonpickle==3.4.2 jsonschema==4.24.0 jsonschema-specifications==2025.4.1 -keystoneauth1==5.6.0 -keystonemiddleware==10.6.0 +keystoneauth1==5.10.0 +keystonemiddleware==10.9.0 kombu==5.5.4 kubernetes==31.0.0 ldap3==2.9.1 Mako==1.3.10 +markdown-it-py==3.0.0 MarkupSafe==3.0.2 +mdurl==0.1.2 microversion-parse==2.0.0 msgpack==1.1.0 netaddr==1.3.0 -netifaces==0.11.0 networkx==3.4.2 oauthlib==3.2.2 -orderly-set==5.4.1 -os-service-types==1.7.0 -oslo.cache==3.7.0 -oslo.concurrency==6.0.0 -oslo.config==9.4.0 -oslo.context==5.5.0 -oslo.db==15.0.0 -oslo.i18n==6.3.0 -oslo.log==5.5.1 -oslo.messaging==14.7.2 -oslo.metrics==0.8.0 -oslo.middleware==6.1.0 -oslo.policy==4.3.0 -oslo.serialization==5.4.1 -oslo.service==3.4.1 -oslo.upgradecheck==2.3.0 -oslo.utils==7.1.0 -oslo.versionedobjects==3.3.0 +orderly-set==5.5.0 +os-service-types==1.8.0 +oslo.cache==3.10.2 +oslo.concurrency==7.1.0 +oslo.config==9.7.1 +oslo.context==5.7.1 +oslo.db==17.2.1 +oslo.i18n==6.5.1 +oslo.log==7.1.0 +oslo.messaging==16.1.0 +oslo.metrics==0.11.0 +oslo.middleware==6.3.1 +oslo.policy==4.5.1 +oslo.serialization==5.7.0 +oslo.service==4.1.1 +oslo.upgradecheck==2.5.0 +oslo.utils==8.2.0 +oslo.versionedobjects==3.6.0 packaging==25.0 Paste==3.10.1 PasteDeploy==3.1.0 PasteScript==3.7.0 pbr==6.1.1 -pecan==1.6.0 +pecan==1.7.0 pip==24.3.1 ply==3.11 prettytable==3.16.0 -promenade @ git+https://opendev.org/airship/promenade.git@84189ac1cae841529ca27aa2ad4a6568e3bbcc64 +promenade @ git+https://opendev.org/airship/promenade.git@4e3e541f5ebd40aea4d25391e646242698493654 prometheus_client==0.22.1 +psutil==7.0.0 psycopg2-binary==2.9.10 PTable==0.9.2 pyasn1==0.6.1 pyasn1_modules==0.4.1 pycadf==4.0.1 pycparser==2.22 +Pygments==2.19.1 PyJWT==2.10.1 pylibyaml==0.1.0 -pyOpenSSL==25.1.0 pyparsing==3.2.3 -pyperclip==1.9.0 -python-barbicanclient==5.7.0 +pyperclip==1.10.0 +python-barbicanclient==7.1.0 python-dateutil==2.9.0.post0 -python-keystoneclient==5.4.0 +python-keystoneclient==5.6.0 python-memcached==1.62 python-mimeparse==2.0.0 pytz==2025.2 @@ -110,18 +112,20 @@ requests==2.32.3 requests-oauthlib==2.0.0 resolver==0.2.1 rfc3986==2.0.0 +rich==13.9.4 +rich-argparse==1.7.1 Routes==2.5.1 rpds-py==0.25.1 rsa==4.9.1 selector==0.10.1 setuptools==75.8.0 -shipyard_client @ git+https://opendev.org/airship/shipyard.git@95b37b822eaf8ad39c644f7007b2c1a07293e5ab#subdirectory=src/bin/shipyard_client +shipyard_client @ git+https://opendev.org/airship/shipyard.git@7ba581dc5d4b854ca06128b29a711393edda6bb6#subdirectory=src/bin/shipyard_client simplejson==3.20.1 six==1.17.0 smmap==5.0.2 SQLAlchemy==1.4.54 statsd==4.0.1 -stevedore==5.4.1 +stevedore==5.5.0 testresources==2.0.2 testscenarios==0.5.0 testtools==2.7.2 @@ -139,6 +143,6 @@ websocket-client==1.8.0 Werkzeug==2.2.3 wheel==0.45.1 wrapt==1.17.2 -xattr==0.10.1 +xattr==0.9.6 yappi==1.6.10 zipp==3.22.0 diff --git a/vcs-requirements.env b/vcs-requirements.env index 385ee801..95e53d6c 100644 --- a/vcs-requirements.env +++ b/vcs-requirements.env @@ -1,3 +1,3 @@ -DECKHAND_VERSION=commit/d8cc9f3ed2c9f2b9d9bf271a72c9bf301f16f647 -SHIPYARD_VERSION=commit/95b37b822eaf8ad39c644f7007b2c1a07293e5ab -PROMENADE_VERSION=commit/84189ac1cae841529ca27aa2ad4a6568e3bbcc64 +DECKHAND_VERSION=commit/1da4b273a5e1160008e819b27faa7650f2defab5 +SHIPYARD_VERSION=commit/7ba581dc5d4b854ca06128b29a711393edda6bb6 +PROMENADE_VERSION=commit/4e3e541f5ebd40aea4d25391e646242698493654