From 4f95f7deb2c1fa28df0e43a91e64b704e98ec364 Mon Sep 17 00:00:00 2001 From: sonianuj287 Date: Sun, 10 Mar 2024 13:11:31 +0530 Subject: [PATCH] Group Based Policy Automation - Antelope Support Change-Id: Icc3dbc98be05305ac2d6f5bbb927363973c58c31 --- .zuul.yaml | 22 +++++++++++++++------- test-requirements.txt | 5 +++-- tox.ini | 10 ++++++---- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8e7cf54..37384f4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,7 +1,7 @@ - project: name: x/group-based-policy-automation templates: - - openstack-python3-zed-jobs + - openstack-python3-antelope-jobs - publish-to-pypi # REVISIT: In the jobs below, the required-projects clause is needed on # the master branch to select the correct version of the requirements @@ -14,26 +14,34 @@ - openstack-tox-pep8: required-projects: - name: openstack/requirements - override-checkout: stable/zed + override-checkout: stable/2023.1 - openstack-tox-py38: required-projects: - name: openstack/requirements - override-checkout: stable/zed + override-checkout: stable/2023.1 - openstack-tox-py39: required-projects: - name: openstack/requirements - override-checkout: stable/zed + override-checkout: stable/2023.1 + - openstack-tox-py310: + required-projects: + - name: openstack/requirements + override-checkout: stable/2023.1 gate: jobs: - openstack-tox-pep8: required-projects: - name: openstack/requirements - override-checkout: stable/zed + override-checkout: stable/2023.1 - openstack-tox-py38: required-projects: - name: openstack/requirements - override-checkout: stable/zed + override-checkout: stable/2023.1 - openstack-tox-py39: required-projects: - name: openstack/requirements - override-checkout: stable/zed + override-checkout: stable/2023.1 + - openstack-tox-py310: + required-projects: + - name: openstack/requirements + override-checkout: stable/2023.1 \ No newline at end of file diff --git a/test-requirements.txt b/test-requirements.txt index 1707844..e1615ea 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,8 +2,9 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. --e git+https://opendev.org/openstack/heat.git@stable/zed#egg=openstack-heat --e git+https://opendev.org/x/python-group-based-policy-client.git@stable/zed#egg=python-group-based-policy-client + +-e git+https://opendev.org/openstack/heat.git@stable/2023.1#egg=openstack-heat +-e git+https://opendev.org/x/python-group-based-policy-client.git@stable/2023.1#egg=python-group-based-policy-client # Hacking already pins down pep8, pyflakes and flake8 hacking>=3.0.1,<3.1.0; # Apache-2.0 # remove this pyflakes from here once you bump the diff --git a/tox.ini b/tox.ini index 9f6c3ab..27f1e42 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,14 @@ [tox] -envlist = py36,py37,pep8 +envlist = testenv minversion = 3.1.0 -skipsdist = True +skipsdist = False [testenv] # Note the hash seed is set to 0 until heat can be tested with a # random hash seed successfully. -basepython = python3 +basepython = + testenv: python3 + setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning OS_TEST_PATH=gbpautomation/heat/tests @@ -14,7 +16,7 @@ setenv = VIRTUAL_ENV={envdir} usedevelop = True install_command = pip install {opts} {packages} deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands =