]> git.apps.os.sepia.ceph.com Git - teuthology.git/log
teuthology.git
3 years agosuite/run: Log total number of jobs scheduled log-total-jobs
Vallari Agrawal [Sun, 3 Jul 2022 09:06:31 +0000 (14:36 +0530)]
suite/run: Log total number of jobs scheduled

Signed-off-by: Vallari Agrawal <val.agl002@gmail.com>
3 years agoMerge pull request #1775 from ceph/update-reqs
Zack Cerza [Tue, 28 Jun 2022 19:26:02 +0000 (13:26 -0600)]
Merge pull request #1775 from ceph/update-reqs

Update pip-tools and sentry-sdk

3 years agoUpdate sentry-sdk 1775/head
Zack Cerza [Tue, 28 Jun 2022 18:36:31 +0000 (18:36 +0000)]
Update sentry-sdk

We've started seeing what appear to be duplicate issues:
https://tracker.ceph.com/issues/56410
Hoping a simple update will resolve this...

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoUpdate pip-tools
Zack Cerza [Tue, 28 Jun 2022 18:36:07 +0000 (18:36 +0000)]
Update pip-tools

Fixes https://github.com/jazzband/pip-tools/issues/1617

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge PR #1772 into master
Patrick Donnelly [Thu, 23 Jun 2022 14:18:08 +0000 (10:18 -0400)]
Merge PR #1772 into master

* refs/pull/1772/head:
Revert "Merge pull request #1624 from batrick/get-valgrind-args"

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
3 years agoRevert "Merge pull request #1624 from batrick/get-valgrind-args" 1772/head
Patrick Donnelly [Wed, 22 Jun 2022 23:54:37 +0000 (19:54 -0400)]
Revert "Merge pull request #1624 from batrick/get-valgrind-args"

This reverts commit 40fff4b2911949847a302adfe2f4714cfaccb58e, reversing
changes made to 93d2b653facc0e5a7a532b39d9ff91a044f2c4a9.

3 years agoMerge pull request #1770 from ceph/plow
Zack Cerza [Wed, 15 Jun 2022 21:05:22 +0000 (15:05 -0600)]
Merge pull request #1770 from ceph/plow

3 years agoopsys.py: Add RHEL9 1770/head
David Galloway [Wed, 15 Jun 2022 20:43:53 +0000 (16:43 -0400)]
opsys.py: Add RHEL9

Signed-off-by: David Galloway <dgallowa@redhat.com>
3 years agoMerge pull request #1765 from ceph/wip-45512
Zack Cerza [Wed, 15 Jun 2022 19:04:45 +0000 (13:04 -0600)]
Merge pull request #1765 from ceph/wip-45512

3 years agoMerge pull request #1764 from kshtsk/wip-watch-fix-typeerror
Zack Cerza [Wed, 8 Jun 2022 21:36:20 +0000 (15:36 -0600)]
Merge pull request #1764 from kshtsk/wip-watch-fix-typeerror

3 years agoMerge pull request #1766 from ceph/rhel86
Zack Cerza [Wed, 8 Jun 2022 21:14:33 +0000 (15:14 -0600)]
Merge pull request #1766 from ceph/rhel86

3 years agoMerge pull request #1767 from ceph/bs-missing-pip
Zack Cerza [Wed, 8 Jun 2022 21:11:46 +0000 (15:11 -0600)]
Merge pull request #1767 from ceph/bs-missing-pip

3 years agobootstrap: If pip is missing, rebuild virtualenv 1767/head
Zack Cerza [Wed, 8 Jun 2022 20:03:30 +0000 (14:03 -0600)]
bootstrap: If pip is missing, rebuild virtualenv

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoopsys.py: Default to RHEL8.6 1766/head
David Galloway [Wed, 8 Jun 2022 19:14:18 +0000 (15:14 -0400)]
opsys.py: Default to RHEL8.6

Signed-off-by: David Galloway <dgallowa@redhat.com>
3 years agonuke.nuke: Rework lock-checking logic 1765/head
Zack Cerza [Wed, 8 Jun 2022 18:41:37 +0000 (12:41 -0600)]
nuke.nuke: Rework lock-checking logic

Previously, we would call list_locks(), then iterate over the response,
each time iterating over the list of targets. If list_locks()
encountered an error and returned an empty response, we'd never actually
verify what we intended to. Instead, we should specifically query for
each target. This is far safer and faster.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agosuite: fix type error when description is none 1764/head
Kyr Shatskyy [Wed, 8 Jun 2022 11:28:15 +0000 (13:28 +0200)]
suite: fix type error when description is none

teuthology-watch fails when run is complete and jobs' description
gets None value

Example:

2022-06-07 16:41:22,538.538 INFO:teuthology.suite:waiting for the run runner-2022-06-07_16:41:04-suse:tier0-ses7p-none-default-ecp to complete
2022-06-07 16:41:22,539.539 DEBUG:teuthology.suite:the list of unfinished jobs will be displayed every 5.0 minutes
2022-06-07 16:46:22,599.599 DEBUG:teuthology.suite:wait for jobs ['654']
2022-06-07 16:51:22,633.633 DEBUG:teuthology.suite:wait for jobs ['654']
2022-06-07 16:51:22,686.686 INFO:teuthology.suite:wait is done
Traceback (most recent call last):
  File "/home/runner/src/teuthology_master/virtualenv/bin/teuthology-wait", line 33, in <module>
    sys.exit(load_entry_point('teuthology', 'console_scripts', 'teuthology-wait')())
  File "/home/runner/src/teuthology_master/scripts/wait.py", line 30, in main
    return teuthology.suite.wait(name, config.max_job_time, None)
  File "/home/runner/src/teuthology_master/teuthology/suite/__init__.py", line 234, in wait
    log.info(job['status'] + " " + url + " " + job['description'])
TypeError: must be str, not NoneType

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
3 years agoMerge pull request #1624 from batrick/get-valgrind-args
Zack Cerza [Tue, 7 Jun 2022 21:17:14 +0000 (15:17 -0600)]
Merge pull request #1624 from batrick/get-valgrind-args

3 years agoMerge pull request #1762 from ceph/nested-subset-fix
Zack Cerza [Mon, 6 Jun 2022 21:17:40 +0000 (15:17 -0600)]
Merge pull request #1762 from ceph/nested-subset-fix

qa: correct line processing logic

3 years agoqa: correct line processing logic 1762/head
Patrick Donnelly [Mon, 6 Jun 2022 18:12:09 +0000 (14:12 -0400)]
qa: correct line processing logic

Most runs don't use --no-nested-subset and for those that used --subset,
the if conditions would correctly pickup "seed" (when it mattered).
However, when --subset was not specified in the original run, the "seed"
was not correctly picked up. Therefore, the result of inserting the "if
no_nested_subset is None:" before the "elif seed is None:" caused it to
never read the seed for most folks teuthology runs.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge pull request #1761 from ceph/git-clone-errors
David Galloway [Wed, 1 Jun 2022 20:25:07 +0000 (16:25 -0400)]
Merge pull request #1761 from ceph/git-clone-errors

repo_utils: Always log git clone failure output

3 years agorepo_utils: Always log git clone failure output 1761/head
Zack Cerza [Wed, 1 Jun 2022 19:23:29 +0000 (13:23 -0600)]
repo_utils: Always log git clone failure output

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge pull request #1753 from ceph/dc-venv
Zack Cerza [Tue, 31 May 2022 19:19:09 +0000 (13:19 -0600)]
Merge pull request #1753 from ceph/dc-venv

3 years agoMerge pull request #1760 from ceph/wip-private-branch
David Galloway [Fri, 27 May 2022 20:18:55 +0000 (16:18 -0400)]
Merge pull request #1760 from ceph/wip-private-branch

suite: Allow 'git@' repo URLs

3 years agosuite: Allow 'git@' repo URLs 1760/head
Zack Cerza [Fri, 27 May 2022 17:47:40 +0000 (11:47 -0600)]
suite: Allow 'git@' repo URLs

We were accidentally mangling them.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge pull request #1757 from ceph/master-to-main
David Galloway [Tue, 24 May 2022 21:05:19 +0000 (17:05 -0400)]
Merge pull request #1757 from ceph/master-to-main

Inclusive Language Update

3 years agotest_util.git_repository: Create main branch 1757/head
Zack Cerza [Tue, 24 May 2022 20:20:21 +0000 (14:20 -0600)]
test_util.git_repository: Create main branch

(if necessary)

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agotest_repo_utils: Don't break with main branch
Zack Cerza [Thu, 21 Apr 2022 17:44:30 +0000 (11:44 -0600)]
test_repo_utils: Don't break with main branch

More generally, if git was configured to use a default branch other
than 'master', this test would fail.

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 9ab6d0a50e4821dccaeef024485986792e60a57b)

3 years agoReplace non-branch occurrences of 'master'
Zack Cerza [Tue, 24 May 2022 19:02:56 +0000 (13:02 -0600)]
Replace non-branch occurrences of 'master'

Signed-off-by: Zack Cerza <zack@cerza.org>
3 years agoReplace 'master' branch references with 'main'
Zack Cerza [Tue, 24 May 2022 17:26:42 +0000 (11:26 -0600)]
Replace 'master' branch references with 'main'

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge PR #1704 into master
Patrick Donnelly [Tue, 24 May 2022 16:14:04 +0000 (12:14 -0400)]
Merge PR #1704 into master

* refs/pull/1704/head:
teuthology/suite/test: test nested subsets
teuthology: add option to disable nested subsets
teuthology/suite: create nested matrix subsets
teuthology/suite: patch builtin open method
teuthology/test: use correct exception type
teuthology/suite/test: make sure patchers are cleaned up on exception
teuthology/suite/test: clarify variable name

Reviewed-by: Zack Cerza <zmc@redhat.com>
3 years agoteuthology/suite/test: test nested subsets 1704/head
Patrick Donnelly [Wed, 9 Feb 2022 22:59:23 +0000 (17:59 -0500)]
teuthology/suite/test: test nested subsets

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoteuthology: add option to disable nested subsets
Patrick Donnelly [Thu, 10 Feb 2022 01:27:48 +0000 (20:27 -0500)]
teuthology: add option to disable nested subsets

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoteuthology/suite: create nested matrix subsets
Patrick Donnelly [Fri, 14 Jan 2022 20:25:14 +0000 (15:25 -0500)]
teuthology/suite: create nested matrix subsets

The general idea is to allow the `%` convolution operator to also subset
the resulting matrix. This is done by specifying a number of divisions
for the subset in the `%` file. Such as:

dir/%:

    8

This commit maps a matrix index range of `[0, Subset.size())` to the
matrix it is taking a subset of, `[0, Matrix.size())`. To get full
coverage, a random number is used to specify "which" subset to use.
Contrast with the `--subset` argument to `teuthology-suite` which lets
you specify which subset.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoteuthology/suite: patch builtin open method
Patrick Donnelly [Fri, 21 Jan 2022 18:59:28 +0000 (13:59 -0500)]
teuthology/suite: patch builtin open method

teuthology.suite.open does not patch properly.

Fixes: 0b822b8455a8b2903759776ff3c4ea05c416b44e
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoteuthology/test: use correct exception type
Patrick Donnelly [Fri, 21 Jan 2022 19:01:22 +0000 (14:01 -0500)]
teuthology/test: use correct exception type

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoteuthology/suite/test: make sure patchers are cleaned up on exception
Patrick Donnelly [Fri, 21 Jan 2022 18:58:39 +0000 (13:58 -0500)]
teuthology/suite/test: make sure patchers are cleaned up on exception

Otherwise, test infrastructure blows up on use of the fake file system
methods.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoteuthology/suite/test: clarify variable name
Patrick Donnelly [Fri, 21 Jan 2022 19:22:17 +0000 (14:22 -0500)]
teuthology/suite/test: clarify variable name

"den" for denominator is not that intuitive.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 years agoMerge pull request #1756 from ljflores/wip-teuthology-suite-priority-table
Laura Flores [Fri, 6 May 2022 20:37:01 +0000 (15:37 -0500)]
Merge pull request #1756 from ljflores/wip-teuthology-suite-priority-table

scripts: add priority table to teuthology-suite --help

3 years agoscripts: add priority table to teuthology-suite --help 1756/head
Laura Flores [Wed, 4 May 2022 19:34:50 +0000 (14:34 -0500)]
scripts: add priority table to teuthology-suite --help

Table copied from https://docs.ceph.com/en/latest/dev/developer_guide/testing_integration_tests/tests-integration-testing-teuthology-intro/.

Signed-off-by: Laura Flores <lflores@redhat.com>
3 years agoMerge pull request #1754 from ceph/deps-upgrade-test
Zack Cerza [Fri, 29 Apr 2022 16:15:03 +0000 (10:15 -0600)]
Merge pull request #1754 from ceph/deps-upgrade-test

Add new GitHub Action to test deps on upgrade

3 years agobootstrap: Do ansible version check inside venv 1754/head
Zack Cerza [Thu, 28 Apr 2022 19:28:33 +0000 (13:28 -0600)]
bootstrap: Do ansible version check inside venv

We need access to the packaging module to do so.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoAdd new GitHub Action to test deps on upgrade
Zack Cerza [Thu, 28 Apr 2022 17:23:44 +0000 (11:23 -0600)]
Add new GitHub Action to test deps on upgrade

We've seen a couple regressions that are only visible when upgrading
and existing virtualenv.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge pull request #1752 from tchaikov/repo-utils-cleanup
Zack Cerza [Wed, 27 Apr 2022 23:02:42 +0000 (17:02 -0600)]
Merge pull request #1752 from tchaikov/repo-utils-cleanup

teuthology/repo_util: pass universal_newlines=True

3 years agotest_repo_utils: Don't break with main branch 1753/head
Zack Cerza [Thu, 21 Apr 2022 17:44:30 +0000 (11:44 -0600)]
test_repo_utils: Don't break with main branch

More generally, if git was configured to use a default branch other
than 'master', this test would fail.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agosuite: Look for teuthology branch mismatches
Zack Cerza [Thu, 21 Apr 2022 16:48:19 +0000 (10:48 -0600)]
suite: Look for teuthology branch mismatches

If config.teuthology_path is set, we don't fetch teuthology at runtime.
This can lead to confusing situations if --teuthology-branch is passed
to teuthology-suite, as the job config will claim a branch is used when
it is not. We can avoid this problem by refusing to schedule if there
is a mismatch.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoexceptions: Add BranchMismatchError
Zack Cerza [Fri, 22 Apr 2022 21:34:51 +0000 (15:34 -0600)]
exceptions: Add BranchMismatchError

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agorepo_utils: Add current_branch()
Zack Cerza [Thu, 21 Apr 2022 16:47:38 +0000 (10:47 -0600)]
repo_utils: Add current_branch()

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agodocker-compose: Move TEUTH_BRANCH definition
Zack Cerza [Wed, 20 Apr 2022 22:54:26 +0000 (16:54 -0600)]
docker-compose: Move TEUTH_BRANCH definition

So that we can access it from within the teuthology container.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agobootstrap: Drop pyc removal
Zack Cerza [Tue, 12 Apr 2022 18:32:12 +0000 (12:32 -0600)]
bootstrap: Drop pyc removal

We stopped writing these files years ago.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoDockerfile: Optimize pip installs
Zack Cerza [Tue, 12 Apr 2022 23:22:54 +0000 (17:22 -0600)]
Dockerfile: Optimize pip installs

With this change, we can avoid rerunning bootstrap on build if
requirements.txt hasn't changed. Build times after non-requirements
changes go from 3-5min to ~2s.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agobootstrap: Optionally skip teuthology install
Zack Cerza [Tue, 12 Apr 2022 18:31:52 +0000 (12:31 -0600)]
bootstrap: Optionally skip teuthology install

The docker-compose dev setup was the inspiration for this feature; it
allows us to split the installation of dependencies and the project
itself into two phases. This in turn allows us to avoid rerunning
bootstrap if requirements.txt didn't change.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoteuthology/repo_util: pass universal_newlines=True 1752/head
Kefu Chai [Wed, 27 Apr 2022 01:46:48 +0000 (09:46 +0800)]
teuthology/repo_util: pass universal_newlines=True

for better readability

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #1751 from ceph/wip-bs-err
Kefu Chai [Wed, 27 Apr 2022 01:44:00 +0000 (09:44 +0800)]
Merge pull request #1751 from ceph/wip-bs-err

bootstrap_teuthology: Call decode() on stderr

3 years agobootstrap_teuthology: Call decode() on stderr 1751/head
Zack Cerza [Wed, 27 Apr 2022 01:09:47 +0000 (19:09 -0600)]
bootstrap_teuthology: Call decode() on stderr

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge pull request #1748 from ceph/ansible-2.10
Kefu Chai [Wed, 27 Apr 2022 00:46:55 +0000 (08:46 +0800)]
Merge pull request #1748 from ceph/ansible-2.10

Update ansible to 2.10

3 years agobootstrap: Drop virtualenv in favor of venv
Zack Cerza [Fri, 1 Apr 2022 17:14:28 +0000 (13:14 -0400)]
bootstrap: Drop virtualenv in favor of venv

We don't need it, and if it is present, setuptools will use
easy_install instead of building wheels.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agorequirements: Update ansible to 2.10 1748/head
Zack Cerza [Wed, 13 Apr 2022 22:36:52 +0000 (16:36 -0600)]
requirements: Update ansible to 2.10

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agobootstrap: If ansible<2.10 is present, remove it
Zack Cerza [Wed, 13 Apr 2022 22:36:45 +0000 (16:36 -0600)]
bootstrap: If ansible<2.10 is present, remove it

... before proceeding. This is because in 2.10, ansible split into two
packages, a scenario that pip apparently isn't able to handle properly.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge pull request #1750 from tchaikov/pass-extra
Zack Cerza [Tue, 26 Apr 2022 16:06:51 +0000 (10:06 -0600)]
Merge pull request #1750 from tchaikov/pass-extra

update-requirements.sh: pass --extra=test to pip-compile

3 years agoMerge pull request #1698 from kshtsk/wip-raise-if-not-reconnect
kyr [Tue, 26 Apr 2022 13:02:52 +0000 (15:02 +0200)]
Merge pull request #1698 from kshtsk/wip-raise-if-not-reconnect

orchestra/remote: throw exception on reconnect failed

3 years agoupdate-requirements.sh: pass --extra=test to pip-compile 1750/head
Kefu Chai [Tue, 26 Apr 2022 01:12:07 +0000 (09:12 +0800)]
update-requirements.sh: pass --extra=test to pip-compile

otherwise the requirements used by test would be missed

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #1749 from tchaikov/setup-add-nose
Zack Cerza [Mon, 25 Apr 2022 21:18:21 +0000 (15:18 -0600)]
Merge pull request #1749 from tchaikov/setup-add-nose

setup.cfg: add nose to "options.extras_require/test"

3 years agosetup.py: dedup the requires 1749/head
Kefu Chai [Sun, 24 Apr 2022 01:29:24 +0000 (09:29 +0800)]
setup.py: dedup the requires

* move the dependencies from options.install_requires to
  options.extras_require if those dependencies are only used by tests.
  as per
  https://packaging.python.org/en/latest/discussions/install-requires-vs-requirements/#id5
  > install_requires is a setuptools setup.py keyword that should be
  > used to specify what a project minimally needs to run correctly.
* remove the duplicated dependencies from options.extras_require
  if they are also listed in options.install_requires.
* update requirements.txt using
  "pip-compile --extra=test pyproject.toml", so requirements.txt
  can include the dependencies required by tests.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoscrape: drop dependency of "six"
Kefu Chai [Sun, 24 Apr 2022 01:28:55 +0000 (09:28 +0800)]
scrape: drop dependency of "six"

since we don't need to be compatible with python2, let's stop using
the six package.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agosetup.cfg: add nose to "options.extras_require/test"
Kefu Chai [Sat, 23 Apr 2022 03:26:48 +0000 (11:26 +0800)]
setup.cfg: add nose to "options.extras_require/test"

some tests are using nose python package. since teuthology is
responsible for preparing the deps to run the tests. let's add
nose back to setup.cfg.

the "nose" package was included in requirements.txt before
21372fd9b2b87bb6417929f10097fba7db9cdca9. in this change, it,
it is brought back.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
3 years agoMerge pull request #1743 from ceph/packaging
Zack Cerza [Thu, 21 Apr 2022 18:08:32 +0000 (12:08 -0600)]
Merge pull request #1743 from ceph/packaging

Revised packaging updates

3 years agoMerge pull request #1747 from ceph/ca-test-fix
Zack Cerza [Wed, 20 Apr 2022 15:06:13 +0000 (09:06 -0600)]
Merge pull request #1747 from ceph/ca-test-fix

task/ceph_ansible: Fix attribute handling

3 years agoMerge pull request #1746 from rishabh-d-dave/py3104-MutableMapping
Kefu Chai [Wed, 20 Apr 2022 12:22:23 +0000 (20:22 +0800)]
Merge pull request #1746 from rishabh-d-dave/py3104-MutableMapping

config: import MuableMapping based on python version

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
3 years agotask/ceph_ansible: Fix attribute handling 1747/head
Zack Cerza [Tue, 19 Apr 2022 23:44:16 +0000 (17:44 -0600)]
task/ceph_ansible: Fix attribute handling

... in get_host_vars(). This had broken unit tests when a top-level
"ceph_ansible" key is present in the teuthology config.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agotox.ini: Drop basepython lines 1743/head
Zack Cerza [Wed, 6 Apr 2022 17:17:03 +0000 (11:17 -0600)]
tox.ini: Drop basepython lines

They're redundant.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agotox.ini: Install 'test' extras for py.test envs
Zack Cerza [Tue, 5 Apr 2022 22:29:43 +0000 (18:29 -0400)]
tox.ini: Install 'test' extras for py.test envs

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoModernized versioning
Zack Cerza [Thu, 31 Mar 2022 19:32:14 +0000 (15:32 -0400)]
Modernized versioning

Using setuptools_scm; we can automatically generate version numbers
instead of using this odd combination of hardcoding and running git
commands. This method is faster as well.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agobootstrap: Install 'test' extras
Zack Cerza [Thu, 31 Mar 2022 21:32:43 +0000 (17:32 -0400)]
bootstrap: Install 'test' extras

So that we can use the 'tests' task.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agorun_tasks: Do not mask missing task dependencies
Zack Cerza [Fri, 1 Apr 2022 15:14:42 +0000 (11:14 -0400)]
run_tasks: Do not mask missing task dependencies

While doing packaging work, I noticed that teuthology began claiming it
couldn't find the 'tests' task. After some slightly painful debugging I
realized the issue was that the task was trying to import pytest, which
wasn't installed. The ModuleNotFoundError that was being raised was
being confused with the exception that would be raised if the task
couldn't be found at all. With this change, we see the root cause.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agotask.tests: Update pytest_runtest_makereport
Zack Cerza [Thu, 31 Mar 2022 20:29:16 +0000 (16:29 -0400)]
task.tests: Update pytest_runtest_makereport

And fix a typo

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agobootstrap: Drop python2 support
Zack Cerza [Thu, 31 Mar 2022 19:43:25 +0000 (15:43 -0400)]
bootstrap: Drop python2 support

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agotox.ini: Set isolated_build
Zack Cerza [Fri, 18 Mar 2022 19:02:10 +0000 (13:02 -0600)]
tox.ini: Set isolated_build

This also requires us to re-add mock to the py3 env.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoTestOpenStackBase.setup: Remove arguments
Zack Cerza [Fri, 18 Mar 2022 18:55:46 +0000 (12:55 -0600)]
TestOpenStackBase.setup: Remove arguments

In newer py.test versions, the test method itself was being passed as
the conf arg, causing errors. We don't even use it, so remove it.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoTolerate a missing manhole package
Zack Cerza [Fri, 18 Mar 2022 18:51:55 +0000 (12:51 -0600)]
Tolerate a missing manhole package

The vast majority of users won't ever need this.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMANIFEST.in: Add tox.ini and pytest.ini
Zack Cerza [Fri, 18 Mar 2022 18:51:34 +0000 (12:51 -0600)]
MANIFEST.in: Add tox.ini and pytest.ini

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoReplace setup.py with setup.cfg and pyproject.toml
Zack Cerza [Thu, 17 Mar 2022 23:34:59 +0000 (17:34 -0600)]
Replace setup.py with setup.cfg and pyproject.toml

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoconfig: import MuableMapping based on python version 1746/head
Rishabh Dave [Sun, 17 Apr 2022 14:59:28 +0000 (20:29 +0530)]
config: import MuableMapping based on python version

MutableMapping has been moved from collections to collections.abc.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
3 years agoMerge pull request #1739 from ceph/docker-compose
Zack Cerza [Mon, 18 Apr 2022 22:52:16 +0000 (16:52 -0600)]
Merge pull request #1739 from ceph/docker-compose

docker-compose: "wait mode"

3 years agodocker-compose.yml: Start beanstalkd sooner 1739/head
Zack Cerza [Mon, 18 Apr 2022 19:59:01 +0000 (13:59 -0600)]
docker-compose.yml: Start beanstalkd sooner

There was a bit of a race condition happening in wait mode, where
teuthology would start up before beanstalkd and fail immediately.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agostart.sh: Default to RSA keys
Zack Cerza [Mon, 18 Apr 2022 18:44:21 +0000 (12:44 -0600)]
start.sh: Default to RSA keys

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agodocker-compose: Add wait mode
Zack Cerza [Thu, 7 Apr 2022 18:07:29 +0000 (12:07 -0600)]
docker-compose: Add wait mode

Instead of scheduling the teuthology:no-ceph suite and then exiting
when it finishes, schedule nothing and don't exit automatically. This
allows running whatever - and however many - tests are desired.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agodocker-compose: Document containerized nodes
Zack Cerza [Mon, 4 Apr 2022 15:06:34 +0000 (11:06 -0400)]
docker-compose: Document containerized nodes

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years ago.dockerignore: Simplify paths
Zack Cerza [Fri, 1 Apr 2022 19:51:41 +0000 (15:51 -0400)]
.dockerignore: Simplify paths

The we we'd used wildcards, we were only ignoring directory contents -
not the directories themselves. Also add the tox temporary directory.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agodocker-compose: Use repo root as build context
Zack Cerza [Fri, 1 Apr 2022 18:02:05 +0000 (14:02 -0400)]
docker-compose: Use repo root as build context

Rather than add more logic to support things like cloning different
forks of the repo, let's just not clone at all.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agostart.sh: Make sure to run docker-compose down
Zack Cerza [Fri, 1 Apr 2022 15:15:54 +0000 (11:15 -0400)]
start.sh: Make sure to run docker-compose down

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge pull request #1741 from ceph/dc-fixes
Zack Cerza [Mon, 18 Apr 2022 18:43:51 +0000 (12:43 -0600)]
Merge pull request #1741 from ceph/dc-fixes

teuthology.sh: Run tests using current branch

3 years agoMerge pull request #1742 from ceph/repo_logging
Zack Cerza [Mon, 18 Apr 2022 18:42:55 +0000 (12:42 -0600)]
Merge pull request #1742 from ceph/repo_logging

repo_utils: Fix logging in bootstrap_teuthology

3 years agorepo_utils: Fix logging in bootstrap_teuthology 1742/head
Zack Cerza [Thu, 14 Apr 2022 18:01:38 +0000 (12:01 -0600)]
repo_utils: Fix logging in bootstrap_teuthology

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoworker: Don't log incorrect teuthology sha1 1741/head
Zack Cerza [Thu, 14 Apr 2022 21:49:37 +0000 (15:49 -0600)]
worker: Don't log incorrect teuthology sha1

If teuthology_path is set, we don't fetch a separate copy of the repo.
In that case, the sha1 logged here may be incorrect.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoteuthology.sh: Run tests using current branch
Zack Cerza [Thu, 14 Apr 2022 19:19:24 +0000 (13:19 -0600)]
teuthology.sh: Run tests using current branch

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agoMerge pull request #1740 from ceph/wip-revert4333
David Galloway [Thu, 14 Apr 2022 15:36:55 +0000 (11:36 -0400)]
Merge pull request #1740 from ceph/wip-revert4333

Revert "Merge pull request #1737 from ceph/build"

3 years agoRevert "Merge pull request #1737 from ceph/build" 1740/head
David Galloway [Thu, 14 Apr 2022 15:19:46 +0000 (11:19 -0400)]
Revert "Merge pull request #1737 from ceph/build"

This reverts commit 43327234bc2c8066c173e4c6d602c8a0a05db642, reversing
changes made to a347b2ac5400a43ba76a678399b1deda7dae1a6c.

3 years agoMerge pull request #1737 from ceph/build
Zack Cerza [Wed, 13 Apr 2022 21:33:45 +0000 (15:33 -0600)]
Merge pull request #1737 from ceph/build

Packaging overhaul

3 years agobootstrap: Drop pyc removal 1737/head
Zack Cerza [Tue, 12 Apr 2022 18:32:12 +0000 (12:32 -0600)]
bootstrap: Drop pyc removal

We stopped writing these files years ago.

Signed-off-by: Zack Cerza <zack@redhat.com>
3 years agobootstrap: Optionally skip teuthology install
Zack Cerza [Tue, 12 Apr 2022 18:31:52 +0000 (12:31 -0600)]
bootstrap: Optionally skip teuthology install

The docker-compose dev setup was the inspiration for this feature; it
allows us to split the installation of dependencies and the project
itself into two phases. This in turn allows us to avoid rerunning
bootstrap if requirements.txt didn't change.

Signed-off-by: Zack Cerza <zack@redhat.com>