diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml deleted file mode 100644 index a12971f..0000000 --- a/.github/workflows/main.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: on push to main - -on: - push: - branches: - - main - -concurrency: - group: main - cancel-in-progress: true - -jobs: - unit_tests: - uses: ./.github/workflows/tox.yaml diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml deleted file mode 100644 index f2b8638..0000000 --- a/.github/workflows/pr.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: on pull request - -on: - pull_request: - types: - - opened - - synchronize - - ready_for_review - - edited - - reopened - branches: - - main - -concurrency: - group: ${{ github.head_ref }} - cancel-in-progress: true - -jobs: - # Run the unit tests on every PR, even from external repos - unit_tests: - uses: ./.github/workflows/tox.yaml diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml deleted file mode 100644 index e6d2fb7..0000000 --- a/.github/workflows/tox.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: Tox unit tests - -on: - workflow_call: - -jobs: - build: - name: Tox unit tests and linting - runs-on: ubuntu-latest - strategy: - matrix: - python-version: ['3.10'] - - steps: - - uses: actions/checkout@v3 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install tox - - - name: Test with tox - run: tox - - - name: Generate coverage reports - run: tox -e cover - - - name: Archive code coverage results - uses: actions/upload-artifact@v3 - with: - name: code-coverage-report - path: cover/ diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..b19f56c --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=review.opendev.org +port=29418 +project=openstack/magnum-capi-helm.git diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..7617961 --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,48 @@ +--- +- project-template: + name: openstack-python3-jobs-magnum + description: | + The standard :zuul:project_template:`openstack-python3-jobs` + but with magnum added as a required-projects. This checks out + the project code and allows tox_install_siblings to use magnum + when building the venv. + check: + jobs: + - openstack-tox-pep8: + required-projects: + - openstack/magnum + - openstack-tox-py38: + required-projects: + - openstack/magnum + - openstack-tox-py39: + required-projects: + - openstack/magnum + - openstack-tox-py310: + required-projects: + - openstack/magnum + - openstack-tox-py311: + required-projects: + - openstack/magnum + gate: + jobs: + - openstack-tox-pep8: + required-projects: + - openstack/magnum + - openstack-tox-py38: + required-projects: + - openstack/magnum + - openstack-tox-py39: + required-projects: + - openstack/magnum + - openstack-tox-py310: + required-projects: + - openstack/magnum + - openstack-tox-py311: + required-projects: + - openstack/magnum + + +- project: + queue: magnum + templates: + - openstack-python3-jobs-magnum diff --git a/test-requirements.txt b/test-requirements.txt index 51a2d30..e9dc685 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,6 @@ python-subunit>=0.0.18 # Apache-2.0/BSD oslotest>=1.10.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testtools>=1.4.0 # MIT -black<25.0.0 +black<25.0.0 # MIT -# pin magnum while out of tree -magnum==17.0.2 +magnum diff --git a/tox.ini b/tox.ini index 931acc8..d1b144f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,7 @@ [tox] minversion = 3.18.0 envlist = py3,black,pep8 +ignore_basepython_conflict = True [testenv] basepython = python3 @@ -10,7 +11,7 @@ setenv = OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 -deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.2} +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs}