diff --git a/.github/workflows/e2e_test.yaml b/.github/workflows/e2e_test.yaml index 2a0ac5a2ad..260571ef82 100644 --- a/.github/workflows/e2e_test.yaml +++ b/.github/workflows/e2e_test.yaml @@ -12,7 +12,7 @@ jobs: # INTEGRATION_TEST_ARGS to operator-workflows automatically. openstack-integration-end-to-end-test: name: end-to-end test using private-endpoint - uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main + uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@fix/deduplicate-charm-artifacts secrets: inherit with: juju-channel: 3.6/stable diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index 3787ed4196..8ac4f45d52 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -14,13 +14,13 @@ concurrency: jobs: openstack-integration-tests-private-endpoint: name: Integration test using private-endpoint - uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main + uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@fix/deduplicate-charm-artifacts secrets: inherit with: juju-channel: 3.6/stable provider: lxd test-tox-env: integration-juju3.6 - modules: '["test_multi_unit_same_machine", "test_charm_metrics_failure", "test_charm_metrics_success", "test_charm_fork_path_change", "test_charm_no_runner", "test_charm_upgrade", "test_reactive"]' + modules: '["test_multi_unit_same_machine"]' # INTEGRATION_TOKEN, INTEGRATION_TOKEN_ALT, OS_* are passed through INTEGRATION_TEST_SECRET_ENV_VALUE_ # mapping. See CONTRIBUTING.md for more details. extra-arguments: | @@ -40,7 +40,7 @@ jobs: 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 + uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@fix/deduplicate-charm-artifacts secrets: inherit with: juju-channel: 3.6/stable @@ -67,7 +67,7 @@ jobs: 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 + uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@fix/deduplicate-charm-artifacts secrets: inherit strategy: matrix: diff --git a/.github/workflows/publish_charm.yaml b/.github/workflows/publish_charm.yaml index a84cba1f56..4892796150 100644 --- a/.github/workflows/publish_charm.yaml +++ b/.github/workflows/publish_charm.yaml @@ -8,5 +8,5 @@ on: jobs: publish-to-edge: - uses: canonical/operator-workflows/.github/workflows/publish_charm.yaml@main + uses: canonical/operator-workflows/.github/workflows/publish_charm.yaml@fix/deduplicate-charm-artifacts secrets: inherit diff --git a/.github/workflows/test_github_runner_manager.yaml b/.github/workflows/test_github_runner_manager.yaml deleted file mode 100644 index bb8598f1d7..0000000000 --- a/.github/workflows/test_github_runner_manager.yaml +++ /dev/null @@ -1,74 +0,0 @@ -name: Tests for github-runner-manager - -on: - pull_request: - -jobs: - application-unit-tests: - name: Unit tests for github-runner-manager - uses: canonical/operator-workflows/.github/workflows/test.yaml@main - secrets: inherit - with: - self-hosted-runner: true - self-hosted-runner-label: edge - working-directory: ./github-runner-manager/ - application-integration-tests: - name: Integration tests for github-runner-manager - runs-on: [self-hosted, pfe-ci] - strategy: - fail-fast: false - matrix: - test-module: - - test_debug_ssh - - test_planner_runner - steps: - - name: Checkout code - uses: actions/checkout@v6.0.2 - - name: Setup Astral UV - uses: astral-sh/setup-uv@v7 - - name: Install tox with UV - run: uv tool install tox --with tox-uv - - name: configure DockerHub mirror - run: | - echo "{\"registry-mirrors\": [\"$DOCKERHUB_MIRROR\"]}" | sudo tee /etc/docker/daemon.json - sudo systemctl restart docker.service - - name: Run integration tests - ${{ matrix.test-module }} - working-directory: ./github-runner-manager/ - env: - # GitHub configuration - # INTEGRATION_TOKEN, INTEGRATION_TOKEN_ALT - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_1 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_1 }} - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_2 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_2 }} - # OpenStack configuration - # OS_AUTH_URL, OS_PROJECT_DOMAIN_NAME, OS_PROJECT_NAME, OS_USER_DOMAIN_NAME, OS_USERNAME, OS_PASSWORD, OS_NETWORK, OS_REGION_NAME - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_3 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_3 }} - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_4 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_4 }} - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_5 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_5 }} - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_6 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_6 }} - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_7 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_7 }} - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_8 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_8 }} - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_9 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_9 }} - ${{ vars.INTEGRATION_TEST_SECRET_ENV_NAME_10 }}: ${{ secrets.INTEGRATION_TEST_SECRET_ENV_VALUE_10 }} - run: | - tox -e integration -- -v --tb=native -s \ - tests/integration/${{ matrix.test-module }}.py \ - --github-repository=${{ 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 }}" \ - --debug-log-dir="/tmp/github-runner-manager-test-logs" - - name: Print debug logs - if: ${{ failure() }} - run: | - echo "Printing debug logs from /tmp/github-runner-manager-test-logs" - ls -l /tmp/github-runner-manager-test-logs - for log_file in /tmp/github-runner-manager-test-logs/*; do - echo "===== Contents of $log_file =====" - cat "$log_file" - echo "=================================" - done