diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index e298bc0987..affbc59741 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -23,7 +23,7 @@ on: type: boolean default: false -concurrency: +concurrency: group: e2e-${{ github.head_ref || github.sha }} cancel-in-progress: true @@ -115,6 +115,7 @@ jobs: UPGRADE_LIGHT_TESTS: ${{ steps.matrix-conditionals.outputs.UPGRADE_LIGHT_TESTS }} UPGRADE_IMPORT_MAINNET_TESTS: ${{ steps.matrix-conditionals.outputs.UPGRADE_IMPORT_MAINNET_TESTS }} ADMIN_TESTS: ${{ steps.matrix-conditionals.outputs.ADMIN_TESTS }} + ADMIN_UPGRADE_TESTS: ${{ steps.matrix-conditionals.outputs.ADMIN_UPGRADE_TESTS }} PERFORMANCE_TESTS: ${{ steps.matrix-conditionals.outputs.PERFORMANCE_TESTS }} STATEFUL_DATA_TESTS: ${{ steps.matrix-conditionals.outputs.STATEFUL_DATA_TESTS }} TSS_MIGRATION_TESTS: ${{ steps.matrix-conditionals.outputs.TSS_MIGRATION_TESTS }} @@ -147,6 +148,7 @@ jobs: core.setOutput('UPGRADE_LIGHT_TESTS', labels.includes('UPGRADE_LIGHT_TESTS')); core.setOutput('UPGRADE_IMPORT_MAINNET_TESTS', labels.includes('UPGRADE_IMPORT_MAINNET_TESTS')); core.setOutput('ADMIN_TESTS', labels.includes('ADMIN_TESTS')); + core.setOutput('ADMIN_UPGRADE_TESTS', labels.includes('ADMIN_UPGRADE_TESTS')); core.setOutput('PERFORMANCE_TESTS', labels.includes('PERFORMANCE_TESTS')); core.setOutput('STATEFUL_DATA_TESTS', labels.includes('STATEFUL_DATA_TESTS')); core.setOutput('TSS_MIGRATION_TESTS', labels.includes('TSS_MIGRATION_TESTS')); @@ -177,6 +179,7 @@ jobs: core.setOutput('UPGRADE_LIGHT_TESTS', true); core.setOutput('UPGRADE_IMPORT_MAINNET_TESTS', true); core.setOutput('ADMIN_TESTS', true); + core.setOutput('ADMIN_UPGRADE_TESTS', true); core.setOutput('PERFORMANCE_TESTS', true); core.setOutput('STATEFUL_DATA_TESTS', true); core.setOutput('SOLANA_TESTS', true); @@ -188,6 +191,7 @@ jobs: core.setOutput('UPGRADE_LIGHT_TESTS', true); core.setOutput('UPGRADE_IMPORT_MAINNET_TESTS', true); core.setOutput('ADMIN_TESTS', true); + core.setOutput('ADMIN_UPGRADE_TESTS', true); core.setOutput('PERFORMANCE_TESTS', true); core.setOutput('STATEFUL_DATA_TESTS', true); core.setOutput('TSS_MIGRATION_TESTS', true); @@ -201,6 +205,7 @@ jobs: core.setOutput('UPGRADE_LIGHT_TESTS', makeTargets.includes('upgrade-test-light')); core.setOutput('UPGRADE_IMPORT_MAINNET_TESTS', makeTargets.includes('upgrade-import-mainnet-test')); core.setOutput('ADMIN_TESTS', makeTargets.includes('admin-test')); + core.setOutput('ADMIN_UPGRADE_TESTS', makeTargets.includes('admin-upgrade-test')); core.setOutput('PERFORMANCE_TESTS', makeTargets.includes('performance-test')); core.setOutput('STATEFUL_DATA_TESTS', makeTargets.includes('import-mainnet-test')); core.setOutput('TSS_MIGRATION_TESTS', makeTargets.includes('tss-migration-test')); @@ -238,6 +243,10 @@ jobs: - make-target: "start-e2e-admin-test" runs-on: ubuntu-20.04 run: ${{ needs.matrix-conditionals.outputs.ADMIN_TESTS == 'true' }} + - make-target: "start-upgrade-test-admin" + runs-on: ubuntu-20.04 + run: ${{ needs.matrix-conditionals.outputs.ADMIN_UPGRADE_TESTS == 'true' }} + timeout-minutes: 40 - make-target: "start-e2e-performance-test" runs-on: buildjet-4vcpu-ubuntu-2204 run: ${{ needs.matrix-conditionals.outputs.PERFORMANCE_TESTS == 'true' }}