Merge branch 'main' into obrok/e2e-runner

.github/workflows/e2e-tests-main-devnet.yml

@@ -557,78 +557,65 @@ jobs:
 #          UPGRADE_FINALIZATION_WAIT_SESSIONS: 2
 #          ONLY_LEGACY: true
 #        timeout-minutes: 10
-
-      - name: Run e2e test
-        uses: ./.github/actions/run-e2e-test
-        with:
-          test-case: version_upgrade::schedule_doomed_version_change
-        env:
-          OVERRIDE_DOCKER_COMPOSE: ./.github/scripts/docker-compose.no_quorum_without_old.override.yml
-          UPGRADE_VERSION: 1
-          UPGRADE_SESSION: 3
-          UPGRADE_FINALIZATION_WAIT_SESSIONS: 2
-          ONLY_LEGACY: true
-        timeout-minutes: 10
-
-  run-e2e-version-upgrade-catchup:
-    needs: [build-test-docker, build-cliain-image]
-    name: Run series of tests where some of the nodes need to do version-upgrade during catch-up
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        include:
-          - nodes: "Node1"
-            ports: "9934"
-            ext_status: "finalized"
-            upgrade_before_disable: "true"
-
-          - nodes: "Node1"
-            ports: "9934"
-            ext_status: "finalized"
-            upgrade_before_disable: "false"
-
-          - nodes: "Node1:Node2"
-            ports: "9934:9935"
-            ext_status: "in-block"
-            upgrade_before_disable: "true"
-
-          - nodes: "Node1:Node2"
-            ports: "9934:9935"
-            ext_status: "in-block"
-            upgrade_before_disable: "false"
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      - name: Download artifact with docker image for aleph-node
-        uses: actions/download-artifact@v2
-        with:
-          name: aleph-test-docker
-
-      - name: Load node docker image
-        shell: bash
-        run: docker load -i aleph-node.tar
-
-      - name: Download artifact with docker image for cliain
-        uses: actions/download-artifact@v2
-        with:
-          name: cliain-docker
-
-      - name: Load cliain docker image
-        shell: bash
-        run: docker load -i cliain.tar
-
-      - name: Call catchup_test.sh
-        timeout-minutes: 10
-        env:
-          UPGRADE_BLOCK: 31
-          NODES: ${{ matrix.nodes }}
-          PORTS: ${{ matrix.ports }}
-          EXT_STATUS: ${{ matrix.ext_status }}
-          UPGRADE_BEFORE_DISABLE: ${{ matrix.upgrade_before_disable }}
-          DOCKER_COMPOSE: docker/docker-compose.bridged.yml
-        run: |
-          ./scripts/catchup_version_upgrade_test.sh
+#  run-e2e-version-upgrade-catchup:
+#    needs: [build-test-docker, build-cliain-image]
+#    name: Run series of tests where some of the nodes need to do version-upgrade during catch-up
+#    runs-on: ubuntu-20.04
+#    strategy:
+#      matrix:
+#        include:
+#          - nodes: "Node1"
+#            ports: "9934"
+#            ext_status: "finalized"
+#            upgrade_before_disable: "true"
+#
+#          - nodes: "Node1"
+#            ports: "9934"
+#            ext_status: "finalized"
+#            upgrade_before_disable: "false"
+#
+#          - nodes: "Node1:Node2"
+#            ports: "9934:9935"
+#            ext_status: "in-block"
+#            upgrade_before_disable: "true"
+#
+#          - nodes: "Node1:Node2"
+#            ports: "9934:9935"
+#            ext_status: "in-block"
+#            upgrade_before_disable: "false"
+#    steps:
+#      - name: Checkout source code
+#        uses: actions/checkout@v2
+#
+#      - name: Download artifact with docker image for aleph-node
+#        uses: actions/download-artifact@v2
+#        with:
+#          name: aleph-test-docker
+#
+#      - name: Load node docker image
+#        shell: bash
+#        run: docker load -i aleph-node.tar
+#
+#      - name: Download artifact with docker image for cliain
+#        uses: actions/download-artifact@v2
+#        with:
+#          name: cliain-docker
+#
+#      - name: Load cliain docker image
+#        shell: bash
+#        run: docker load -i cliain.tar
+#
+#      - name: Call catchup_test.sh
+#        timeout-minutes: 10
+#        env:
+#          UPGRADE_BLOCK: 31
+#          NODES: ${{ matrix.nodes }}
+#          PORTS: ${{ matrix.ports }}
+#          EXT_STATUS: ${{ matrix.ext_status }}
+#          UPGRADE_BEFORE_DISABLE: ${{ matrix.upgrade_before_disable }}
+#          DOCKER_COMPOSE: docker/docker-compose.bridged.yml
+#        run: |
+#          ./scripts/catchup_version_upgrade_test.sh
 
   check-e2e-test-suite-completion:
     needs: [