From 222de623361d29dd9927fc7b4d1f7748603bc520 Mon Sep 17 00:00:00 2001
From: Marcin <marcin.radecki@cardinals.cc>
Date: Thu, 17 Aug 2023 14:01:37 +0200
Subject: [PATCH] Fix new worfklow syntax - attempt #8

---
 .github/actions/create-featurenet/action.yml  |  2 +-
 .github/workflows/nightly-logic-e2e-tests.yml | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/actions/create-featurenet/action.yml b/.github/actions/create-featurenet/action.yml
index 77d306c325..59a3dd1ea7 100644
--- a/.github/actions/create-featurenet/action.yml
+++ b/.github/actions/create-featurenet/action.yml
@@ -118,7 +118,7 @@ runs:
       shell: bash
       env:
         # yamllint disable-line rule:line-length
-        APP_NAME: ${{ inputs.featurenet-name != '' && inputs.featurenet-name || format('{0}{1}{2}', 'fe-', steps.get-ref-properties.outputs.branch-name-for-argo, github.run_id) }}
+        APP_NAME: ${{ inputs.featurenet-name != '' && inputs.featurenet-name || format('{0}{1}-{2}', 'fe-', steps.get-ref-properties.outputs.branch-name-for-argo, github.run_id) }}
       run: |
         name_local=${{ env.APP_NAME }}
         echo "name=$name_local" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/nightly-logic-e2e-tests.yml b/.github/workflows/nightly-logic-e2e-tests.yml
index c8a5af0d10..2845f8b329 100644
--- a/.github/workflows/nightly-logic-e2e-tests.yml
+++ b/.github/workflows/nightly-logic-e2e-tests.yml
@@ -28,6 +28,22 @@ jobs:
     uses: ./.github/workflows/_build-test-node-and-runtime.yml
     secrets: inherit
 
+  store-test-node-and-runtime:
+    name: Store test node and runtime in Devnet bucket
+    runs-on: ubuntu-20.04
+    needs: [build-test-node-and-runtime]
+    steps:
+      - name: Checkout aleph-node source code
+        uses: actions/checkout@v3
+
+      - name: Store test node and runtime
+        uses: ./.github/actions/store-node-and-runtime
+        with:
+          profile: test
+          aws-access-key-id: ${{ secrets.AWS_DEVNET_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_DEVNET_SECRET_ACCESS_KEY }}
+          aws-bucket: ${{ secrets.CI_DEVNET_S3BUCKET_NAME }}
+
   push-featurnet-node-image-to-ecr:
     needs: [build-test-node-and-runtime]
     name: Build and push PR test docker image to ECR
@@ -36,8 +52,6 @@ jobs:
 
   runs-e2e-test-on-fe:
     needs: [push-featurnet-node-image-to-ecr, build-e2e-client-image]
-    # to prevent this job skipping if build already exists on ECR
-    if: always()
     name: Run e2e test on FE
     runs-on: [self-hosted, Linux, X64, large]
     steps: