Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] test: add test for juju 2.9 #169

Closed
wants to merge 10 commits into from
Closed

[WIP] test: add test for juju 2.9 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
161b606
test: add test for juju 2.9
yanksyoon Jun 11, 2024
96daea4
git remove vscode
yanksyoon Jun 11, 2024
1d1522d
ignore .vscode dir
yanksyoon Jun 11, 2024
f25ba84
fix test name
yanksyoon Jun 11, 2024
9384b60
fix test name
yanksyoon Jun 11, 2024
5e3e5f0
assumes api juju 2.9
yanksyoon Jun 11, 2024
cfc5ddf
python-libjuju downgrade
yanksyoon Jun 11, 2024
36b5376
python libjuju matchint juju version
yanksyoon Jun 11, 2024
487ca4d
Merge branch 'main' into test/juju-2.9
yanksyoon Jun 17, 2024
696244b
Merge branch 'main' into test/juju-2.9
yanksyoon Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/integration_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,26 @@ jobs:
-c "sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config
chmod +x tests/integration/pre_run_script.sh
./tests/integration/pre_run_script.sh"
test-tox-env: integration-juju3.1
juju-channel: 3.1/stable
self-hosted-runner: true
self-hosted-runner-label: "xlarge"
microk8s-addons: "dns ingress rbac storage metallb:10.15.119.2-10.15.119.4 registry"

integration-tests-juju-29:
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
secrets: inherit
with:
channel: 1.28-strict/stable
extra-arguments: |
--kube-config=${GITHUB_WORKSPACE}/kube-config
modules: '["test_auth_proxy.py", "test_cos.py", "test_ingress.py", "test_jenkins.py", "test_k8s_agent.py", "test_machine_agent.py", "test_plugins.py", "test_proxy.py", "test_upgrade.py", "test_external_agent.py"]'
pre-run-script: |
-c "sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config
chmod +x tests/integration/pre_run_script.sh
./tests/integration/pre_run_script.sh"
test-tox-env: integration-juju2.9
juju-channel: 2.9/stable
self-hosted-runner: true
self-hosted-runner-label: "xlarge"
microk8s-addons: "dns ingress rbac storage metallb:10.15.119.2-10.15.119.4 registry"
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,6 @@ dmypy.json

# charm artifact
*.charm

# Development artifacdts
.vscode/
1 change: 1 addition & 0 deletions metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
name: jenkins-k8s
assumes:
- k8s-api
- juju >= 2.9
display-name: Jenkins K8s
summary: Jenkins Continuous Integration Server
maintainers:
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@ deps =
commands =
coverage report

[testenv:integration]
[testenv:integration-juju{3.2,3.1,2.9}]
description = Run integration tests
deps =
pytest
juju>=3,<4
macaroonbakery==1.3.2 # temporary bug with libjuju
juju3.2: juju==3.2.*
juju3.1: juju==3.1.*
juju2.9: juju==2.9.*
ops
pytest-operator
pytest-asyncio
# Type error problem with newer version of macaroonbakery
macaroonbakery==1.3.2
macaroonbakery
-r{toxinidir}/requirements.txt
-r{[vars]tst_path}integration/requirements.txt
commands =
Expand Down
Loading