Skip to content

Commit 5bdf4f1

Browse files
committed
Merge remote-tracking branch 'origin/main' into prometheus-alerts
2 parents 4b22c12 + b3cb409 commit 5bdf4f1

File tree

9 files changed

+67
-11
lines changed

9 files changed

+67
-11
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @stackhpc/kayobe

.github/workflows/pr-tests.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Pull request
2+
on:
3+
pull_request:
4+
jobs:
5+
rocky9-ovs-aio-test:
6+
name: aio (Rocky 9 OVS)
7+
uses: stackhpc/stackhpc-kayobe-config/.github/workflows/stackhpc-all-in-one.yml@stackhpc/2024.1
8+
with:
9+
kayobe_image: ghcr.io/stackhpc/stackhpc-kayobe-config:stackhpc-2024.1
10+
os_distribution: rocky
11+
os_release: "9"
12+
ssh_username: cloud-user
13+
neutron_plugin: ovs
14+
OS_CLOUD: openstack
15+
stackhpc_cloud_tests_version: ${{ github.ref }}
16+
repository: stackhpc/stackhpc-kayobe-config
17+
github_ref: stackhpc/2024.1
18+
runner: arc-aio-cloud-tests-runner
19+
secrets: inherit
20+
21+
ubuntu-jammy-ovn-aio-test:
22+
name: aio (Ubuntu Jammy OVN)
23+
uses: stackhpc/stackhpc-kayobe-config/.github/workflows/stackhpc-all-in-one.yml@stackhpc/2024.1
24+
with:
25+
kayobe_image: ghcr.io/stackhpc/stackhpc-kayobe-config:stackhpc-2024.1
26+
os_distribution: ubuntu
27+
os_release: jammy
28+
ssh_username: ubuntu
29+
neutron_plugin: ovn
30+
OS_CLOUD: openstack
31+
stackhpc_cloud_tests_version: ${{ github.ref }}
32+
repository: stackhpc/stackhpc-kayobe-config
33+
github_ref: stackhpc/2024.1
34+
runner: arc-aio-cloud-tests-runner
35+
secrets: inherit
36+
37+
lint:
38+
runs-on: ubuntu-22.04
39+
steps:
40+
- uses: actions/checkout@v4
41+
42+
- name: Install pip dependencies
43+
run: pip install -r requirements.txt
44+
45+
- name: Run pylint
46+
run: |
47+
set +e # disabling exit on non-zero error code so can output warnings without failing
48+
pylint stackhpc_cloud_tests/*.py
49+
EXIT_CODE=$?
50+
set -e
51+
if [[ $(($EXIT_CODE & 3)) > 0 ]] #bitwise check for pylint exit codes which indicate errors (01 and 10) https://pylint.readthedocs.io/en/latest/user_guide/usage/run.html#exit-codes
52+
then
53+
exit 1
54+
fi

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# StackHPC OpenStack Tests
1+
# StackHPC Cloud Tests
22

3-
Automated testing for StackHPC OpenStack.
3+
Automated testing for StackHPC OpenStack Clouds.
44

55
Provides test coverage of various aspects of OpenStack and related services, including:
66

@@ -19,7 +19,7 @@ Create a virtual environment.
1919
python3 -m venv venv
2020
```
2121

22-
Install stackhpc-openstack-tests and its dependencies.
22+
Install stackhpc-cloud-tests and its dependencies.
2323

2424
```sh
2525
venv/bin/pip install <path/to/repo> -r <path/to/repo>/requirements.txt
@@ -30,11 +30,11 @@ venv/bin/pip install <path/to/repo> -r <path/to/repo>/requirements.txt
3030
Run all tests provided.
3131

3232
```sh
33-
py.test --pyargs stackhpc_openstack_tests
33+
py.test --pyargs stackhpc_cloud_tests
3434
```
3535

3636
Or run tests from a specific submodule.
3737

3838
```sh
39-
py.test --pyargs stackhpc_openstack_tests.test_prometheus
39+
py.test --pyargs stackhpc_cloud_tests.test_prometheus
4040
```

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
opensearch-py==2.5.*
22
prometheus-api-client==0.5.*
33
pytest-testinfra==10.1.*
4+
pylint==3.3.*

setup.cfg

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[metadata]
2-
name = stackhpc-openstack-tests
3-
version = 0.1.0
4-
summary = Automated testing for StackHPC OpenStack
2+
name = stackhpc-cloud-tests
3+
version = 0.2.0
4+
summary = Automated testing for StackHPC OpenStack Clouds
55
description-file = README.md
66
author = Mark Goddard
77
author-email = [email protected]
8-
url = https://github.com/stackhpc/stackhpc-openstack-tests
8+
url = https://github.com/stackhpc/stackhpc-cloud-tests
99
python-requires = >=3.6
1010
classifier =
1111
Environment :: OpenStack
@@ -26,7 +26,7 @@ classifier =
2626

2727
[files]
2828
packages =
29-
stackhpc_openstack_tests
29+
stackhpc_cloud_tests
3030

3131
[options]
3232
install_requires =
File renamed without changes.

stackhpc_openstack_tests/test_opensearch.py renamed to stackhpc_cloud_tests/test_opensearch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import os
2121
import pytest
2222

23-
from stackhpc_openstack_tests import utils
23+
from stackhpc_cloud_tests import utils
2424

2525

2626
@pytest.fixture
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)