Skip to content

Commit

Permalink
Split metrics integration test (#192)
Browse files Browse the repository at this point in the history
* Split metrics integration test

* Outcomment other integration tests

* outcomment e2e test

* Revert "Split metrics integration test"

This reverts commit 7f994e6

* fix juju 3.1

* Revert "fix juju 3.1"

This reverts commit fd3a27e.

* Revert "Revert "Split metrics integration test""

This reverts commit 9ec7a4e.

* Revert "Revert "Revert "Split metrics integration test"""

This reverts commit 2007a24.

* Revert "Revert "fix juju 3.1""

This reverts commit a8667e3.

* Revert previous commits

This reverts commit 4160d20.

Revert "Outcomment other integration tests"

This reverts commit d90fb3f.

Revert "Revert "Revert "Revert "Split metrics integration test""""

This reverts commit cc3ef44.

Revert "Revert "Revert "fix juju 3.1"""

This reverts commit a91597d.
  • Loading branch information
cbartz committed Jan 18, 2024
1 parent 1f11e2e commit 0c28442
Show file tree
Hide file tree
Showing 6 changed files with 391 additions and 329 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
pre-run-script: scripts/pre-integration-test.sh
provider: lxd
test-tox-env: integration-juju2.9
modules: '["test_charm_fork_repo", "test_charm_no_runner", "test_charm_scheduled_events", "test_charm_one_runner", "test_charm_metrics", "test_self_hosted_runner", "test_charm_with_proxy", "test_charm_with_juju_storage"]'
modules: '["test_charm_fork_repo", "test_charm_no_runner", "test_charm_scheduled_events", "test_charm_one_runner", "test_charm_metrics_success", "test_charm_metrics_failure", "test_self_hosted_runner", "test_charm_with_proxy", "test_charm_with_juju_storage"]'
integration-tests-juju3:
name: Integration test with juju 3.1
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
Expand All @@ -23,4 +23,4 @@ jobs:
pre-run-script: scripts/pre-integration-test.sh
provider: lxd
test-tox-env: integration-juju3.1
modules: '["test_charm_fork_repo", "test_charm_no_runner", "test_charm_scheduled_events", "test_charm_one_runner", "test_charm_metrics", "test_self_hosted_runner", "test_charm_with_proxy", "test_charm_with_juju_storage"]'
modules: '["test_charm_fork_repo", "test_charm_no_runner", "test_charm_scheduled_events", "test_charm_one_runner", "test_charm_metrics_success", "test_charm_metrics_failure", "test_self_hosted_runner", "test_charm_with_proxy", "test_charm_with_juju_storage"]'
2 changes: 2 additions & 0 deletions tests/integration/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Copyright 2024 Canonical Ltd.
# See LICENSE file for licensing details.
Loading

0 comments on commit 0c28442

Please sign in to comment.