From ab61b93c382783c37e2d2e3ecf4e2e0838d058af Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Mon, 8 Dec 2025 16:23:52 +0800 Subject: [PATCH 1/9] Add uv+ruff --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 272dc34b..367f34a6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: self-hosted-runner: false integration-test: name: Integration Test - uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main + uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@cache-rock secrets: inherit with: extra-arguments: >- @@ -30,7 +30,7 @@ jobs: channel: 1.32/stable integration-test-juju3: name: Integration Test on Juju3 - uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main + uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@cache-rock secrets: inherit with: extra-arguments: >- From 30d294b0478129c146a296a6ca46edb77ad2dd5d Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Mon, 26 Jan 2026 21:41:56 +0800 Subject: [PATCH 2/9] test --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 44988720..bd744797 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -54,6 +54,7 @@ jobs: setup-devstack-swift: true trivy-image-config: ./trivy.yaml with-uv: true + allure-report: if: ${{ !cancelled() && github.event_name == 'schedule' }} needs: From 90946359659f4d8aa7a9d121c681c0acbebaaece Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Mon, 26 Jan 2026 21:52:55 +0800 Subject: [PATCH 3/9] test --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bd744797..44988720 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -54,7 +54,6 @@ jobs: setup-devstack-swift: true trivy-image-config: ./trivy.yaml with-uv: true - allure-report: if: ${{ !cancelled() && github.event_name == 'schedule' }} needs: From f3049af1cb5e452a2b48fad64c773dadd56daa3b Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Mon, 26 Jan 2026 21:54:45 +0800 Subject: [PATCH 4/9] test --- .github/workflows/test.yaml | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 44988720..4acec248 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,26 +12,26 @@ jobs: with: self-hosted-runner: false with-uv: true - integration-test: - name: Integration Test - uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh - secrets: inherit - with: - extra-arguments: >- - --openstack-rc=${GITHUB_WORKSPACE}/openrc - --kube-config=${GITHUB_WORKSPACE}/kube-config - --screenshot-dir=/tmp - modules: '["test_addon", "test_core", "test_external", "test_ingress"]' - pre-run-script: | - -c "sudo microk8s enable hostpath-storage - sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner - sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config - chmod +x tests/integration/pre_run_script.sh - ./tests/integration/pre_run_script.sh" - setup-devstack-swift: true - trivy-image-config: ./trivy.yaml - channel: 1.32/stable - with-uv: true +# integration-test: +# name: Integration Test +# uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh +# secrets: inherit +# with: +# extra-arguments: >- +# --openstack-rc=${GITHUB_WORKSPACE}/openrc +# --kube-config=${GITHUB_WORKSPACE}/kube-config +# --screenshot-dir=/tmp +# modules: '["test_addon", "test_core", "test_external", "test_ingress"]' +# pre-run-script: | +# -c "sudo microk8s enable hostpath-storage +# sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner +# sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config +# chmod +x tests/integration/pre_run_script.sh +# ./tests/integration/pre_run_script.sh" +# setup-devstack-swift: true +# trivy-image-config: ./trivy.yaml +# channel: 1.32/stable +# with-uv: true integration-test-juju3: name: Integration Test on Juju3 uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh From dd4554c91d49940429e40754a3891f729263eb4d Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Mon, 26 Jan 2026 21:56:13 +0800 Subject: [PATCH 5/9] test --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4acec248..399b4219 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,6 +57,6 @@ jobs: allure-report: if: ${{ !cancelled() && github.event_name == 'schedule' }} needs: - - integration-test +# - integration-test - integration-test-juju3 uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main From 73740c11515af4bd0636309d5f5fd378ad2d808c Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Mon, 26 Jan 2026 22:03:16 +0800 Subject: [PATCH 6/9] test --- .github/workflows/test.yaml | 60 ++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 399b4219..d0e68577 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,28 +12,8 @@ jobs: with: self-hosted-runner: false with-uv: true -# integration-test: -# name: Integration Test -# uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh -# secrets: inherit -# with: -# extra-arguments: >- -# --openstack-rc=${GITHUB_WORKSPACE}/openrc -# --kube-config=${GITHUB_WORKSPACE}/kube-config -# --screenshot-dir=/tmp -# modules: '["test_addon", "test_core", "test_external", "test_ingress"]' -# pre-run-script: | -# -c "sudo microk8s enable hostpath-storage -# sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner -# sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config -# chmod +x tests/integration/pre_run_script.sh -# ./tests/integration/pre_run_script.sh" -# setup-devstack-swift: true -# trivy-image-config: ./trivy.yaml -# channel: 1.32/stable -# with-uv: true - integration-test-juju3: - name: Integration Test on Juju3 + integration-test: + name: Integration Test uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh secrets: inherit with: @@ -41,22 +21,42 @@ jobs: --openstack-rc=${GITHUB_WORKSPACE}/openrc --kube-config=${GITHUB_WORKSPACE}/kube-config --screenshot-dir=/tmp - juju-channel: 3/stable - channel: 1.32-strict/stable - modules: '["test_addon", "test_core", "test_cos_grafana", "test_cos_loki", "test_cos_prometheus"]' + modules: '["test_addon", "test_core", "test_external", "test_ingress"]' pre-run-script: | -c "sudo microk8s enable hostpath-storage sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config - chmod +x tests/integration/pre_run_script_juju3.sh - ./tests/integration/pre_run_script_juju3.sh" - test-tox-env: "integration-juju3" + chmod +x tests/integration/pre_run_script.sh + ./tests/integration/pre_run_script.sh" setup-devstack-swift: true trivy-image-config: ./trivy.yaml + channel: 1.32/stable with-uv: true +# integration-test-juju3: +# name: Integration Test on Juju3 +# uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh +# secrets: inherit +# with: +# extra-arguments: >- +# --openstack-rc=${GITHUB_WORKSPACE}/openrc +# --kube-config=${GITHUB_WORKSPACE}/kube-config +# --screenshot-dir=/tmp +# juju-channel: 3/stable +# channel: 1.32-strict/stable +# modules: '["test_addon", "test_core", "test_cos_grafana", "test_cos_loki", "test_cos_prometheus"]' +# pre-run-script: | +# -c "sudo microk8s enable hostpath-storage +# sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner +# sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config +# chmod +x tests/integration/pre_run_script_juju3.sh +# ./tests/integration/pre_run_script_juju3.sh" +# test-tox-env: "integration-juju3" +# setup-devstack-swift: true +# trivy-image-config: ./trivy.yaml +# with-uv: true allure-report: if: ${{ !cancelled() && github.event_name == 'schedule' }} needs: -# - integration-test - - integration-test-juju3 + - integration-test +# - integration-test-juju3 uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main From f3a6c60b7c86cf8bbe47146e2df4805d63612969 Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Mon, 26 Jan 2026 22:05:00 +0800 Subject: [PATCH 7/9] test --- .github/workflows/test.yaml | 59 +++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d0e68577..3ad0bd9f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,8 +12,28 @@ jobs: with: self-hosted-runner: false with-uv: true - integration-test: - name: Integration Test +# integration-test: +# name: Integration Test +# uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh +# secrets: inherit +# with: +# extra-arguments: >- +# --openstack-rc=${GITHUB_WORKSPACE}/openrc +# --kube-config=${GITHUB_WORKSPACE}/kube-config +# --screenshot-dir=/tmp +# modules: '["test_addon", "test_core", "test_external", "test_ingress"]' +# pre-run-script: | +# -c "sudo microk8s enable hostpath-storage +# sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner +# sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config +# chmod +x tests/integration/pre_run_script.sh +# ./tests/integration/pre_run_script.sh" +# setup-devstack-swift: true +# trivy-image-config: ./trivy.yaml +# channel: 1.32/stable +# with-uv: true + integration-test-juju3: + name: Integration Test on Juju3 uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh secrets: inherit with: @@ -21,42 +41,23 @@ jobs: --openstack-rc=${GITHUB_WORKSPACE}/openrc --kube-config=${GITHUB_WORKSPACE}/kube-config --screenshot-dir=/tmp + juju-channel: 3/stable + channel: 1.32-strict/stable +# modules: '["test_addon", "test_core", "test_cos_grafana", "test_cos_loki", "test_cos_prometheus"]' modules: '["test_addon", "test_core", "test_external", "test_ingress"]' pre-run-script: | -c "sudo microk8s enable hostpath-storage sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config - chmod +x tests/integration/pre_run_script.sh - ./tests/integration/pre_run_script.sh" + chmod +x tests/integration/pre_run_script_juju3.sh + ./tests/integration/pre_run_script_juju3.sh" + test-tox-env: "integration-juju3" setup-devstack-swift: true trivy-image-config: ./trivy.yaml - channel: 1.32/stable with-uv: true -# integration-test-juju3: -# name: Integration Test on Juju3 -# uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh -# secrets: inherit -# with: -# extra-arguments: >- -# --openstack-rc=${GITHUB_WORKSPACE}/openrc -# --kube-config=${GITHUB_WORKSPACE}/kube-config -# --screenshot-dir=/tmp -# juju-channel: 3/stable -# channel: 1.32-strict/stable -# modules: '["test_addon", "test_core", "test_cos_grafana", "test_cos_loki", "test_cos_prometheus"]' -# pre-run-script: | -# -c "sudo microk8s enable hostpath-storage -# sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner -# sudo microk8s config > ${GITHUB_WORKSPACE}/kube-config -# chmod +x tests/integration/pre_run_script_juju3.sh -# ./tests/integration/pre_run_script_juju3.sh" -# test-tox-env: "integration-juju3" -# setup-devstack-swift: true -# trivy-image-config: ./trivy.yaml -# with-uv: true allure-report: if: ${{ !cancelled() && github.event_name == 'schedule' }} needs: - - integration-test -# - integration-test-juju3 +# - integration-test + - integration-test-juju3 uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main From 08c941a51e8c3d25ed6b7a2fb507cc0a722469a0 Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Mon, 26 Jan 2026 22:14:02 +0800 Subject: [PATCH 8/9] test --- .github/workflows/test.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3ad0bd9f..e3d89603 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,8 +32,10 @@ jobs: # trivy-image-config: ./trivy.yaml # channel: 1.32/stable # with-uv: true - integration-test-juju3: - name: Integration Test on Juju3 +# integration-test-juju3: +# name: Integration Test on Juju3 + integration-test: + name: Integration Test uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh secrets: inherit with: @@ -43,8 +45,7 @@ jobs: --screenshot-dir=/tmp juju-channel: 3/stable channel: 1.32-strict/stable -# modules: '["test_addon", "test_core", "test_cos_grafana", "test_cos_loki", "test_cos_prometheus"]' - modules: '["test_addon", "test_core", "test_external", "test_ingress"]' + modules: '["test_addon", "test_core", "test_cos_grafana", "test_cos_loki", "test_cos_prometheus"]' pre-run-script: | -c "sudo microk8s enable hostpath-storage sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner @@ -58,6 +59,6 @@ jobs: allure-report: if: ${{ !cancelled() && github.event_name == 'schedule' }} needs: -# - integration-test - - integration-test-juju3 + - integration-test +# - integration-test-juju3 uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main From ade57843b746e9d2c89158d8e2fa8d79da7e6f00 Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Tue, 27 Jan 2026 00:28:46 +0800 Subject: [PATCH 9/9] test --- .github/workflows/test.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e3d89603..399b4219 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,10 +32,8 @@ jobs: # trivy-image-config: ./trivy.yaml # channel: 1.32/stable # with-uv: true -# integration-test-juju3: -# name: Integration Test on Juju3 - integration-test: - name: Integration Test + integration-test-juju3: + name: Integration Test on Juju3 uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@install-refresh secrets: inherit with: @@ -59,6 +57,6 @@ jobs: allure-report: if: ${{ !cancelled() && github.event_name == 'schedule' }} needs: - - integration-test -# - integration-test-juju3 +# - integration-test + - integration-test-juju3 uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main