Revert "disable most integration tests"

This reverts commit 876bb68.
canonical · Sep 18, 2024 · b1d31ad · b1d31ad
1 parent e2e035a
commit b1d31ad
Showing 1 changed file with 28 additions and 31 deletions.
diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml
@@ -8,48 +8,45 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
-# TODO: disabled tests to reduce resource usage and speedup testing, re-enable before merging
-
   # test option values defined at test/conftest.py are passed on via repository secret
   # INTEGRATION_TEST_ARGS to operator-workflows automatically.
-#  integration-tests:
-#    name: Integration test with juju 3.1
-#    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
-#    secrets: inherit
-#    with:
-#      juju-channel: 3.1/stable
-#      pre-run-script: scripts/pre-integration-test.sh
-#      provider: lxd
-#      test-tox-env: integration-juju3.1
-#      # These important local LXD test has no OpenStack integration versions.
-#      # test_charm_scheduled_events ensures reconcile events are fired on a schedule.
-#      # test_debug_ssh ensures tmate SSH actions works.
-#      # TODO: Add OpenStack integration versions of these tests.
-#      modules: '["test_charm_scheduled_events", "test_debug_ssh"]'
-#  openstack-interface-tests-private-endpoint:
-#    name: openstack interface test using private-endpoint
-#    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
-#    secrets: inherit
-#    with:
-#      juju-channel: 3.2/stable
-#      pre-run-script: scripts/setup-lxd.sh
-#      provider: lxd
-#      test-tox-env: integration-juju3.2
-#      modules: '["test_runner_manager_openstack"]'
-#      self-hosted-runner: true
-#      self-hosted-runner-label: stg-private-endpoint
+  integration-tests:
+    name: Integration test with juju 3.1
+    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
+    secrets: inherit
+    with:
+      juju-channel: 3.1/stable
+      pre-run-script: scripts/pre-integration-test.sh
+      provider: lxd
+      test-tox-env: integration-juju3.1
+      # These important local LXD test has no OpenStack integration versions.
+      # test_charm_scheduled_events ensures reconcile events are fired on a schedule.
+      # test_debug_ssh ensures tmate SSH actions works.
+      # TODO: Add OpenStack integration versions of these tests.
+      modules: '["test_charm_scheduled_events", "test_debug_ssh"]'
+  openstack-interface-tests-private-endpoint:
+    name: openstack interface test using private-endpoint
+    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
+    secrets: inherit
+    with:
+      juju-channel: 3.2/stable
+      pre-run-script: scripts/setup-lxd.sh
+      provider: lxd
+      test-tox-env: integration-juju3.2
+      modules: '["test_runner_manager_openstack"]'
+      self-hosted-runner: true
+      self-hosted-runner-label: stg-private-endpoint
   openstack-integration-tests-private-endpoint:
     name: Integration test using private-endpoint
     uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
-#    needs: openstack-interface-tests-private-endpoint
+    needs: openstack-interface-tests-private-endpoint
     secrets: inherit
     with:
       juju-channel: 3.2/stable
       pre-run-script: scripts/setup-lxd.sh
       provider: lxd
       test-tox-env: integration-juju3.2
-      modules: '["test_reactive"]'
+      modules: '["test_charm_metrics_failure", "test_charm_metrics_success", "test_charm_fork_repo", "test_charm_runner", "test_reactive"]'
       extra-arguments: "-m openstack"
       self-hosted-runner: true
       self-hosted-runner-label: stg-private-endpoint