Skip to content

[DONOTMERGE] test: flaky prometheus test #761

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

Closed
cbartz wants to merge 8 commits into from
Closed

[DONOTMERGE] test: flaky prometheus test #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6fdda65
REVERT ME: disable other tests for efficiency
cbartz Mar 20, 2026
d6c3444
test: add diagonosis for prometheus metrics test
cbartz Mar 20, 2026
5f8afd5
test: add alternative using subprocess
cbartz Mar 20, 2026
957b844
test: add test timeout of 60 minutes
cbartz Mar 20, 2026
d5b482e
test: use full jubilant path
cbartz Mar 20, 2026
dbc86b0
test: three variants at same time
cbartz Mar 21, 2026
d7f6b97
Revert "test: add diagonosis for prometheus metrics test"
cbartz Mar 21, 2026
f12bb6c
test: original vs full jubilant
cbartz Mar 21, 2026
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
48 changes: 0 additions & 48 deletions .github/workflows/e2e_test.yaml
View file
Open in desktop

This file was deleted.

116 changes: 59 additions & 57 deletions .github/workflows/integration_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,31 @@ concurrency:
cancel-in-progress: true

jobs:
openstack-integration-tests-private-endpoint:
name: Integration test using private-endpoint
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
secrets: inherit
with:
juju-channel: 3.6/stable
provider: lxd
test-tox-env: integration-juju3.6
modules: '["test_multi_unit_same_machine", "test_charm_fork_path_change", "test_charm_no_runner", "test_charm_upgrade"]'
# INTEGRATION_TOKEN, INTEGRATION_TOKEN_ALT, OS_* are passed through INTEGRATION_TEST_SECRET_ENV_VALUE_<N>
# mapping. See CONTRIBUTING.md for more details.
extra-arguments: |
-m=openstack \
--log-format="%(asctime)s %(levelname)s %(message)s" \
--path="${{ vars.INTEGRATION_TEST_PATH }}" \
--https-proxy="${{ vars.INTEGRATION_TEST_HTTPS_PROXY }}" \
--http-proxy="${{ vars.INTEGRATION_TEST_HTTP_PROXY }}" \
--no-proxy="${{ vars.INTEGRATION_TEST_NO_PROXY }}" \
--openstack-https-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_HTTPS_PROXY }}" \
--openstack-http-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_HTTP_PROXY }}" \
--openstack-no-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_NO_PROXY }}" \
--openstack-flavor-name="${{ vars.INTEGRATION_TEST_OPENSTACK_FLAVOR_NAME }}" \
--openstack-image-id="${{ vars.INTEGRATION_TEST_IMAGE_ID }}" \
--dockerhub-mirror="${{ vars.INTEGRATION_TEST_DOCKERHUB_MIRROR }}"
self-hosted-runner: true
self-hosted-runner-label: pfe-ci
# DIAGNOSTIC: Commented out to isolate test_prometheus_metrics hang.
# openstack-integration-tests-private-endpoint:
# name: Integration test using private-endpoint
# uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
# secrets: inherit
# with:
# juju-channel: 3.6/stable
# provider: lxd
# test-tox-env: integration-juju3.6
# modules: '["test_multi_unit_same_machine", "test_charm_fork_path_change", "test_charm_no_runner", "test_charm_upgrade"]'
# extra-arguments: |
# -m=openstack \
# --log-format="%(asctime)s %(levelname)s %(message)s" \
# --path="${{ vars.INTEGRATION_TEST_PATH }}" \
# --https-proxy="${{ vars.INTEGRATION_TEST_HTTPS_PROXY }}" \
# --http-proxy="${{ vars.INTEGRATION_TEST_HTTP_PROXY }}" \
# --no-proxy="${{ vars.INTEGRATION_TEST_NO_PROXY }}" \
# --openstack-https-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_HTTPS_PROXY }}" \
# --openstack-http-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_HTTP_PROXY }}" \
# --openstack-no-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_NO_PROXY }}" \
# --openstack-flavor-name="${{ vars.INTEGRATION_TEST_OPENSTACK_FLAVOR_NAME }}" \
# --openstack-image-id="${{ vars.INTEGRATION_TEST_IMAGE_ID }}" \
# --dockerhub-mirror="${{ vars.INTEGRATION_TEST_DOCKERHUB_MIRROR }}"
# self-hosted-runner: true
# self-hosted-runner-label: pfe-ci
openstack-integration-tests-cross-controller-private-endpoint:
name: Cross controller integration test using private-endpoint
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
Expand All @@ -47,7 +46,8 @@ jobs:
pre-run-script: tests/integration/setup-integration-tests.sh
provider: lxd
test-tox-env: integration-juju3.6
modules: '["test_prometheus_metrics"]'
test-timeout: 120
modules: '["test_prometheus_metrics_original", "test_prometheus_metrics_full_jubilant"]'
# INTEGRATION_TOKEN, INTEGRATION_TOKEN_ALT, OS_* are passed through INTEGRATION_TEST_SECRET_ENV_VALUE_<N>
# mapping. See CONTRIBUTING.md for more details.
extra-arguments: |
Expand All @@ -65,38 +65,40 @@ jobs:
--dockerhub-mirror="${{ vars.INTEGRATION_TEST_DOCKERHUB_MIRROR }}"
self-hosted-runner: true
self-hosted-runner-label: pfe-ci
openstack-integration-tests-runner-bases:
name: Runner tests across bases
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
secrets: inherit
strategy:
matrix:
base: ["22.04", "24.04"]
with:
juju-channel: 3.6/stable
provider: lxd
test-tox-env: integration-juju3.6
modules: '["test_charm_runner"]'
extra-arguments: |
-m=openstack \
--log-format="%(asctime)s %(levelname)s %(message)s" \
--path="${{ vars.INTEGRATION_TEST_PATH }}" \
--https-proxy="${{ vars.INTEGRATION_TEST_HTTPS_PROXY }}" \
--http-proxy="${{ vars.INTEGRATION_TEST_HTTP_PROXY }}" \
--no-proxy="${{ vars.INTEGRATION_TEST_NO_PROXY }}" \
--openstack-https-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_HTTPS_PROXY }}" \
--openstack-http-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_HTTP_PROXY }}" \
--openstack-no-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_NO_PROXY }}" \
--openstack-flavor-name="${{ vars.INTEGRATION_TEST_OPENSTACK_FLAVOR_NAME }}" \
--openstack-image-id="${{ vars.INTEGRATION_TEST_IMAGE_ID }}" \
--dockerhub-mirror="${{ vars.INTEGRATION_TEST_DOCKERHUB_MIRROR }}" \
--base="${{ matrix.base }}"
self-hosted-runner: true
self-hosted-runner-label: pfe-ci
# DIAGNOSTIC: Commented out to isolate test_prometheus_metrics hang.
# openstack-integration-tests-runner-bases:
# name: Runner tests across bases
# uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
# secrets: inherit
# strategy:
# matrix:
# base: ["22.04", "24.04"]
# with:
# juju-channel: 3.6/stable
# provider: lxd
# test-tox-env: integration-juju3.6
# modules: '["test_charm_runner"]'
# extra-arguments: |
# -m=openstack \
# --log-format="%(asctime)s %(levelname)s %(message)s" \
# --path="${{ vars.INTEGRATION_TEST_PATH }}" \
# --https-proxy="${{ vars.INTEGRATION_TEST_HTTPS_PROXY }}" \
# --http-proxy="${{ vars.INTEGRATION_TEST_HTTP_PROXY }}" \
# --no-proxy="${{ vars.INTEGRATION_TEST_NO_PROXY }}" \
# --openstack-https-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_HTTPS_PROXY }}" \
# --openstack-http-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_HTTP_PROXY }}" \
# --openstack-no-proxy="${{ vars.INTEGRATION_TEST_OPENSTACK_NO_PROXY }}" \
# --openstack-flavor-name="${{ vars.INTEGRATION_TEST_OPENSTACK_FLAVOR_NAME }}" \
# --openstack-image-id="${{ vars.INTEGRATION_TEST_IMAGE_ID }}" \
# --dockerhub-mirror="${{ vars.INTEGRATION_TEST_DOCKERHUB_MIRROR }}" \
# --base="${{ matrix.base }}"
# self-hosted-runner: true
# self-hosted-runner-label: pfe-ci
allure-report:
if: ${{ (success() || failure()) && github.event_name == 'schedule' }}
needs:
- openstack-integration-tests-private-endpoint
# DIAGNOSTIC: Only cross-controller job active.
# - openstack-integration-tests-private-endpoint
- openstack-integration-tests-cross-controller-private-endpoint
- openstack-integration-tests-runner-bases
# - openstack-integration-tests-runner-bases
uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main
13 changes: 0 additions & 13 deletions .github/workflows/test.yaml
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions .github/workflows/test_github_runner_manager.yaml
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/tics.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading