diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e8ea1d8..a85cc55 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,49 +44,49 @@ jobs: name: Build charms uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v2 - integration-test: - strategy: - fail-fast: false - matrix: - tox-environments: - - integration-password-rotation - - integration-provider - - integration-tls - name: ${{ matrix.tox-environments }} - needs: - - lint - - unit-test - - build - runs-on: ubuntu-latest - timeout-minutes: 120 - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup operator environment - # TODO: Replace with custom image on self-hosted runner - uses: charmed-kubernetes/actions-operator@main - with: - provider: microk8s - bootstrap-options: "--agent-version 2.9.45" - - name: Download packed charm(s) - uses: actions/download-artifact@v3 - with: - name: ${{ needs.build.outputs.artifact-name }} - - name: Select tests - id: select-tests - run: | - if [ "${{ github.event_name }}" == "schedule" ] - then - echo Running unstable and stable tests - echo "mark_expression=" >> $GITHUB_OUTPUT - else - echo Skipping unstable tests - echo "mark_expression=not unstable" >> $GITHUB_OUTPUT - fi - - name: Run integration tests - run: tox run -e ${{ matrix.tox-environments }} -- -m '${{ steps.select-tests.outputs.mark_expression }}' - env: - CI_PACKED_CHARMS: ${{ needs.build.outputs.charms }} + # integration-test: + # strategy: + # fail-fast: false + # matrix: + # tox-environments: + # - integration-password-rotation + # - integration-provider + # - integration-tls + # name: ${{ matrix.tox-environments }} + # needs: + # - lint + # - unit-test + # - build + # runs-on: ubuntu-latest + # timeout-minutes: 120 + # steps: + # - name: Checkout + # uses: actions/checkout@v3 + # - name: Setup operator environment + # # TODO: Replace with custom image on self-hosted runner + # uses: charmed-kubernetes/actions-operator@main + # with: + # provider: microk8s + # bootstrap-options: "--agent-version 2.9.45" + # - name: Download packed charm(s) + # uses: actions/download-artifact@v3 + # with: + # name: ${{ needs.build.outputs.artifact-name }} + # - name: Select tests + # id: select-tests + # run: | + # if [ "${{ github.event_name }}" == "schedule" ] + # then + # echo Running unstable and stable tests + # echo "mark_expression=" >> $GITHUB_OUTPUT + # else + # echo Skipping unstable tests + # echo "mark_expression=not unstable" >> $GITHUB_OUTPUT + # fi + # - name: Run integration tests + # run: tox run -e ${{ matrix.tox-environments }} -- -m '${{ steps.select-tests.outputs.mark_expression }}' + # env: + # CI_PACKED_CHARMS: ${{ needs.build.outputs.charms }} integration-ha: strategy: @@ -94,13 +94,13 @@ jobs: matrix: tox-environments: - integration-ha - - integration-replication + # - integration-replication name: ${{ matrix.tox-environments }} needs: - lint - unit-test - build - - integration-test + # - integration-test runs-on: ubuntu-latest timeout-minutes: 120 steps: @@ -127,6 +127,8 @@ jobs: echo Skipping unstable tests echo "mark_expression=not unstable" >> $GITHUB_OUTPUT fi + - name: Setup upterm session + uses: lhotari/action-upterm@v1 - name: Run integration tests run: tox run -e ${{ matrix.tox-environments }} -- -m '${{ steps.select-tests.outputs.mark_expression }}' env: diff --git a/tests/integration/ha/test_ha.py b/tests/integration/ha/test_ha.py index 5f55ffd..029feee 100644 --- a/tests/integration/ha/test_ha.py +++ b/tests/integration/ha/test_ha.py @@ -450,6 +450,9 @@ async def test_full_cluster_restart(ops_test: OpsTest, request): parent=parent, hosts=hosts, username=helpers.USERNAME, password=password ) + logger.info("SLEEPING") + await asyncio.sleep(100000) + # kill all units "simultaneously" await asyncio.gather( *[