Update tempest version and drop U and T jobs

The commit updates tempest version and removes Ussuri and Train jobs
as those aren't supported by the community anymore.
The patch also updates old openstack.org links.

Depends-On: https://review.opendev.org/c/openinfra/ansible-role-refstack-client/+/854211
Change-Id: Idf69f02ba844bdeea21ec744ec41ca78bbd1907d
This commit is contained in:
Martin Kopec 2022-06-17 15:43:41 +02:00
parent eb3c6d4957
commit df3ce16947
5 changed files with 15 additions and 24 deletions

View File

@ -1,8 +1,6 @@
- project: - project:
templates: templates:
- openstack-cover-jobs - openstack-cover-jobs
- openstack-python36-jobs
- openstack-python37-jobs
- openstack-python3-zed-jobs - openstack-python3-zed-jobs
check: check:
jobs: jobs:
@ -21,10 +19,6 @@
irrelevant-files: *refstack-client-irrelevant-files irrelevant-files: *refstack-client-irrelevant-files
- refstack-client-devstack-victoria: - refstack-client-devstack-victoria:
irrelevant-files: *refstack-client-irrelevant-files irrelevant-files: *refstack-client-irrelevant-files
- refstack-client-devstack-ussuri:
irrelevant-files: *refstack-client-irrelevant-files
- refstack-client-devstack-train:
irrelevant-files: *refstack-client-irrelevant-files
- opendev-tox-docs - opendev-tox-docs
gate: gate:
jobs: jobs:
@ -38,10 +32,6 @@
irrelevant-files: *refstack-client-irrelevant-files irrelevant-files: *refstack-client-irrelevant-files
- refstack-client-devstack-victoria: - refstack-client-devstack-victoria:
irrelevant-files: *refstack-client-irrelevant-files irrelevant-files: *refstack-client-irrelevant-files
- refstack-client-devstack-ussuri:
irrelevant-files: *refstack-client-irrelevant-files
- refstack-client-devstack-train:
irrelevant-files: *refstack-client-irrelevant-files
- opendev-tox-docs - opendev-tox-docs
promote: promote:
jobs: jobs:

View File

@ -26,11 +26,11 @@ We've created an "easy button" for Ubuntu, Centos, RHEL and openSUSE.
b. -t option allows to specify tag in Tempest repository which will be installed. b. -t option allows to specify tag in Tempest repository which will be installed.
For example: execute ``./setup_env -t tags/3`` to install Tempest tag-3. For example: execute ``./setup_env -t tags/3`` to install Tempest tag-3.
By default, Tempest will be installed from commit By default, Tempest 31.1.0 will be installed from commit
1d500e79156ada6bc6fdb628ed1da0efd4121f6a (Oct, 2019). 56d259dd78cc9ae974cc5dc24a54dbd8008770e6 (June 2022).
c. -p option allows to specify python version - python 2.7 (-p 2), 3.6 (-p 3) c. -p option allows to specify python version - python 2.7 (-p 2), 3.8.10 (-p 3)
or any specific one by -p X.X.X. Default to python 3.6. or any specific one by -p X.X.X. Default to python 3.8.10.
d. -q option makes ``refstack-client`` run quitely - if ``.tempest`` d. -q option makes ``refstack-client`` run quitely - if ``.tempest``
directory exists ``refstack-client`` is considered as installed. directory exists ``refstack-client`` is considered as installed.

View File

@ -1,7 +1,7 @@
# A minimal accounts.yaml file # A minimal accounts.yaml file
# Will likely not work with swift, since additional # Will likely not work with swift, since additional
# roles are required. For more documentation see: # roles are required. For more documentation see:
# https://git.openstack.org/cgit/openstack/tempest/tree/etc/accounts.yaml.sample # https://opendev.org/openstack/tempest/src/branch/master/etc/accounts.yaml.sample
- username: '$USERNAME' - username: '$USERNAME'
project_name: '$PROJECTNAME' project_name: '$PROJECTNAME'

View File

@ -1,9 +1,10 @@
#!/bin/bash -x #!/bin/bash -x
#Default Tempest commit: SHA 1d500e79156ada6bc6fdb628ed1da0efd4121f6a (Oct 2019) # Default Tempest commit:
CHECKOUT_POINT=1d500e79156ada6bc6fdb628ed1da0efd4121f6a # SHA 56d259dd78cc9ae974cc5dc24a54dbd8008770e6 (June 2022) Tag 31.1.0
PY_VERSION="3.6.0" CHECKOUT_POINT=56d259dd78cc9ae974cc5dc24a54dbd8008770e6
UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master" PY_VERSION="3.8.10"
UPPER_CONSTRAINTS_FILE="https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt"
# Prints help # Prints help
function usage { function usage {
@ -15,8 +16,8 @@ function usage {
echo " -h Print this usage message" echo " -h Print this usage message"
echo " -c Tempest test runner commit. You can specify SHA or branch here" echo " -c Tempest test runner commit. You can specify SHA or branch here"
echo " If no commit or tag is specified, tempest will be install from commit" echo " If no commit or tag is specified, tempest will be install from commit"
echo " -p [ 2 | 3 | X.X.X ] - Uses either python 2.7 (if -p 2), 3.6 (if -p 3)" echo " -p [ 2 | 3 | X.X.X ] - Uses either python 2.7 (if -p 2), 3.8.10 (if -p 3)"
echo " or given specific version (if -p X.X.X). Default to python 3.6" echo " or given specific version (if -p X.X.X). Default to python 3.8.10"
echo " -q Run quietly. If .tempest folder exists, refstack-client is considered as installed" echo " -q Run quietly. If .tempest folder exists, refstack-client is considered as installed"
echo " -s Use python-tempestconf from the given source (path), used when running f.e. in Zuul" echo " -s Use python-tempestconf from the given source (path), used when running f.e. in Zuul"
echo " -t Tempest test runner tag. You can specify tag here" echo " -t Tempest test runner tag. You can specify tag here"
@ -131,10 +132,10 @@ else
fi fi
if [ -z ${TEMPESTCONF_SOURCE} ]; then if [ -z ${TEMPESTCONF_SOURCE} ]; then
git clone https://git.openstack.org/openinfra/python-tempestconf.git ${TEMPESTCONF_DIR} git clone https://opendev.org/openinfra/python-tempestconf.git ${TEMPESTCONF_DIR}
fi fi
git clone https://git.openstack.org/openstack/tempest.git ${TEMPEST_DIR} git clone https://opendev.org/openstack/tempest.git ${TEMPEST_DIR}
cd ${TEMPEST_DIR} cd ${TEMPEST_DIR}
git checkout $CHECKOUT_POINT || if [ $? -ne 0 ]; then exit 1; fi git checkout $CHECKOUT_POINT || if [ $? -ne 0 ]; then exit 1; fi

View File

@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
OS_TEST_PATH=./refstack_client/tests/unit OS_TEST_PATH=./refstack_client/tests/unit
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
git+https://git.openstack.org/openinfra/python-tempestconf@master#egg=python_tempestconf git+https://opendev.org/openinfra/python-tempestconf@master#egg=python_tempestconf
commands = commands =
stestr run {posargs} stestr run {posargs}