diff --git a/jobs/swh-packages.yaml b/jobs/swh-packages.yaml index 1785b01..eab7767 100644 --- a/jobs/swh-packages.yaml +++ b/jobs/swh-packages.yaml @@ -1,155 +1,157 @@ - job-group: name: 'swh-jobs-{name}' jobs: - "{name}" - "{name}/incoming-tag" - "{name}/pypi-upload" - "{name}/tests" - "{name}/tox" - "debian/packages/{name}" - "debian/packages/{name}/update-for-release" - "debian/packages/{name}/automatic-backport" - "debian/packages/{name}/gbp-buildpackage" - project: name: DCORE display-name: swh-core pkg: core jobs: - 'swh-jobs-{name}' - project: name: DDEP display-name: swh-deposit pkg: deposit jobs: - 'swh-jobs-{name}' - project: name: DGRPH display-name: swh-graph pkg: graph jobs: - 'swh-jobs-{name}' - project: name: DCIDX display-name: swh-indexer pkg: indexer jobs: - 'swh-jobs-{name}' - project: name: DICP display-name: swh-icinga-plugins pkg: icinga-plugins jobs: - 'swh-jobs-{name}' - project: name: DJNL display-name: swh-journal docker-image: swh-kafka pkg: journal jobs: - 'swh-jobs-{name}' - project: name: DLS display-name: swh-lister pkg: lister jobs: - 'swh-jobs-{name}' - project: name: DLDBASE display-name: swh-loader-core pkg: loader.core jobs: - 'swh-jobs-{name}' - project: name: DLDG display-name: swh-loader-git pkg: loader.git jobs: - 'swh-jobs-{name}' - project: name: DLDHG display-name: swh-loader-mercurial pkg: loader.mercurial jobs: - 'swh-jobs-{name}' - project: name: DLDSVN display-name: swh-loader-svn pkg: loader.svn jobs: - 'swh-jobs-{name}' - project: name: DMOD display-name: swh-model pkg: model jobs: - 'swh-jobs-{name}' - project: name: DOBJS display-name: swh-objstorage pkg: objstorage deb-extra-repositories: ceph jobs: - 'swh-jobs-{name}' - project: name: DSEA display-name: swh-search pkg: search jobs: - 'swh-jobs-{name}' - project: name: TSBX display-name: swh-sandbox pkg: sandbox incoming-tag-auto-pypi-host: test.pypi.org jobs: - "{name}" - "{name}/incoming-tag" - "{name}/pypi-upload" - "{name}/tests" - "{name}/tox" - project: name: DSCH display-name: swh-scheduler pkg: scheduler jobs: - 'swh-jobs-{name}' - project: name: DSTO display-name: swh-storage pkg: storage jobs: - 'swh-jobs-{name}' + - '{name}/tox': + pytest_params: -m cassandra -n 3 - project: name: DVAU display-name: swh-vault pkg: vault jobs: - 'swh-jobs-{name}' - project: name: DWAPPS display-name: swh-web pkg: web jobs: - 'swh-jobs-{name}' - '{name}/cypress' - '{name}/cypress-diff' diff --git a/jobs/templates/swh-tox.yaml b/jobs/templates/swh-tox.yaml index b55899a..f645972 100644 --- a/jobs/templates/swh-tox.yaml +++ b/jobs/templates/swh-tox.yaml @@ -1,52 +1,56 @@ - job-template: name: '{name}/tox' display-name: 'Phab. Diff' docker-image: swh-tox node: "{docker-image}" auth-token: ph4br1cat0r parameters: - string: name: REPO description: PHID of the Diffusion repository - string: name: PHID description: PHID of the Target object - string: name: DIFF_ID description: ID of the Diff patch to apply, if any + - string: + name: pytest_params + description: extra parameters to pass to pytest + default: "" scm: - git: url: https://forge.softwareheritage.org/source/{display-name}.git branches: - origin/master wrappers: - phabricator-differential: apply-to-master: true patch-with-force-flag: true builders: - shell: | echo "Run tox for:" echo " REPO=$REPO" echo " PHID=$PHID" echo " DIFF_ID=$DIFF_ID" - shell: | if (python3 -m tox -a | grep -q -e '^flake8-phab$' ); then python3 -m tox -e flake8-phab else python3 -m tox -e flake8 fi - - shell: python3 -m tox --result-json tox-results.json + - shell: python3 -m tox --result-json tox-results.json -- $pytest_params publishers: - phabricator: uberalls-enabled: false comment-on-success: true comment-with-console-link-on-failure: true process-lint: true lint-file: .phabricator-lint lint-file-size: 1000000 - archive: artifacts: "*.json,.coverage*,.phabricator*"