@@ -790,6 +790,48 @@ jobs:
790790 runner : embedded-cluster
791791 - test : TestMultiNodeAirgapHADisasterRecovery
792792 runner : embedded-cluster
793+ steps :
794+ - name : Checkout
795+ uses : actions/checkout@v4
796+ - name : Download current binary
797+ uses : actions/download-artifact@v4
798+ with :
799+ name : current-release
800+ path : output/bin
801+
802+ - uses : ./.github/actions/e2e
803+ with :
804+ test-name : ' ${{ matrix.test }}'
805+ is-large-runner : ${{ matrix.runner == 'embedded-cluster' }}
806+ airgap-license-id : ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_LICENSE_ID }}
807+ snapshot-license-id : ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE_ID }}
808+ snapshot-license : ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE }}
809+ airgap-snapshot-license-id : ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_SNAPSHOT_LICENSE_ID }}
810+ license-id : ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE_ID }}
811+ license : ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}
812+ dr-aws-access-key-id : ${{ secrets.TESTIM_AWS_ACCESS_KEY_ID }}
813+ dr-aws-secret-access-key : ${{ secrets.TESTIM_AWS_SECRET_ACCESS_KEY }}
814+ k0s-version : ${{ needs.build-current.outputs.k0s_version }}
815+ k0s-version-previous : ${{ needs.build-previous-k0s.outputs.k0s_version }}
816+ k0s-version-previous-stable : ${{ needs.find-previous-stable.outputs.k0s_version }}
817+ version-specifier : ${{ needs.export-version-specifier.outputs.version_specifier }}
818+
819+ e2e-main :
820+ name : E2E (on merge)
821+ if : github.event_name == 'push' && github.ref == 'refs/heads/main'
822+ runs-on : ${{ matrix.runner || 'ubuntu-22.04' }}
823+ needs :
824+ - build-current
825+ - build-legacydr
826+ - build-previous-k0s
827+ - build-upgrade
828+ - find-previous-stable
829+ - release-app
830+ - export-version-specifier
831+ strategy :
832+ fail-fast : false
833+ matrix :
834+ include :
793835 - test : TestFiveNodesAirgapUpgrade
794836 runner : embedded-cluster
795837 steps :
@@ -825,6 +867,7 @@ jobs:
825867 runs-on : ubuntu-20.04
826868 needs :
827869 - e2e
870+ - e2e-main
828871 - e2e-docker
829872 - sanitize
830873 - test
@@ -838,6 +881,9 @@ jobs:
838881 - name : fail if e2e job was not successful
839882 if : needs.e2e.result != 'success'
840883 run : exit 1
884+ - name : fail if e2e-main job was not successful
885+ if : needs.e2e-main.result != 'success' && needs.e2e-main.result != 'skipped'
886+ run : exit 1
841887 - name : fail if e2e-docker job was not successful
842888 if : needs.e2e-docker.result != 'success'
843889 run : exit 1
0 commit comments