From f881de9c83ac835536e700b272ca032ca0c80ca2 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:13:51 +0200
Subject: [PATCH 01/33] Actions revisions

---
 .github/workflows/binaries-x86-64.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 58e6d73f05..a40d60c601 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -35,7 +35,7 @@ jobs:
         run: sudo rm -rf ${{ github.workspace }}/*
 
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Extract branch name
         id: extract_branch
@@ -47,12 +47,10 @@ jobs:
           musl-gcc -v
 
       - name: Install Rust ${{ env.rust_stable }}
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@${{ env.rust_stable }}
         with:
-          toolchain: ${{ env.rust_stable }}
           components: rustfmt, clippy
-          target: x86_64-unknown-linux-musl
-          override: true
+          targets: x86_64-unknown-linux-musl
 
       - name: Set build target for cache
         id: setup_cache_target
@@ -87,7 +85,7 @@ jobs:
           fi
 
       - name: Upload binaries
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: Yagna ${{ runner.os }}
           path: build

From 187b89e620c50d86f7ec4763c195021ee587f129 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:15:43 +0200
Subject: [PATCH 02/33] f

---
 .github/workflows/binaries-x86-64.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index a40d60c601..0ae1798432 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -47,8 +47,9 @@ jobs:
           musl-gcc -v
 
       - name: Install Rust ${{ env.rust_stable }}
-        uses: dtolnay/rust-toolchain@${{ env.rust_stable }}
+        uses: dtolnay/rust-toolchain@master
         with:
+          toolchain: ${{ env.rust_stable }}
           components: rustfmt, clippy
           targets: x86_64-unknown-linux-musl
 

From 0c1b151976b4dab5e04e6c8b3bc2bee0ac4380e6 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:23:33 +0200
Subject: [PATCH 03/33] f

---
 .github/workflows/binaries-x86-64.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 0ae1798432..49d39bedde 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -4,9 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       profile:
-        description: 'Profile (unused right now)'
+        description: 'Build profile'
         required: true
         default: 'debug'
+      rust_version:
+        description: 'Rust version'
+        required: true
+        default: '1.71.1'
   push:
     branches:
       - master
@@ -20,9 +24,6 @@ on:
       - release/*
       - p2p-stability
 
-env:
-  rust_stable: 1.71.1
-
 jobs:
   build:
     name: Build binaries (x86-64)
@@ -46,10 +47,10 @@ jobs:
           sudo apt-get -y install musl musl-tools
           musl-gcc -v
 
-      - name: Install Rust ${{ env.rust_stable }}
+      - name: Install Rust ${{ github.event.inputs.rust_version }}
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.rust_stable }}
+          toolchain: ${{ github.event.inputs.rust_version }}
           components: rustfmt, clippy
           targets: x86_64-unknown-linux-musl
 
@@ -61,12 +62,12 @@ jobs:
         continue-on-error: true
         run:
           # Uncomment line if you want need to clear cache
-          # rm -rf "/opt/yagna_cache/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target"
-          cp -rp "/opt/yagna_cache/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target" target
+          # rm -rf "/opt/yagna_cache/${{ github.event.inputs.rust_version }}/${{ github.event.inputs.build_profile }}/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target"
+          cp -rp "/opt/yagna_cache/${{ github.event.inputs.rust_version }}/${{ github.event.inputs.build_profile }}/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target" target
 
       - name: Build binaries
         run: |
-          cargo build --features static-openssl --target x86_64-unknown-linux-musl -p yagna -p ya-exe-unit -p gftp -p golemsp -p ya-provider
+          cargo build --profile ${{ github.event.inputs.build_profile }} --features static-openssl --target x86_64-unknown-linux-musl -p yagna -p ya-exe-unit -p gftp -p golemsp -p ya-provider
 
       - name: Copy binaries
         shell: bash
@@ -94,5 +95,5 @@ jobs:
       - name: Save local cache
         run: |
           # copy to /opt/yagna_cache and preserve permissions and timestamps
-          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target"
+          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ github.event.inputs.rust_version }}/${{ github.event.inputs.build_profile }}/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target"
 

From c98c23293e269cfdad5c1aa388148ab1ad0029e6 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:36:52 +0200
Subject: [PATCH 04/33] f

---
 .github/workflows/binaries-x86-64.yml | 49 +++++++++++----------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 49d39bedde..883e32c49c 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -18,6 +18,10 @@ on:
       - p2p-stability
       - '**/all-tests'
       - '**/integration-tests'
+    inputs:
+      profile:
+        default: 'debug'
+      rust_version:
   pull_request:
     branches:
       - master
@@ -32,59 +36,44 @@ jobs:
       RUSTFLAGS: "-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1"
     runs-on: [yagna-builder, ubuntu-22.04]
     steps:
-      - name: Clean runner data
-        run: sudo rm -rf ${{ github.workspace }}/*
-
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Extract branch name
-        id: extract_branch
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+      - name: Set input variables
+        id: variables
+        run: |
+          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+          echo "build_profile=${{ github.event.inputs.profile || debug }}" >> $GITHUB_OUTPUT
+          echo "rust_version=${{ github.event.inputs.rust_version || 1.71.1 }}" >> $GITHUB_OUTPUT
 
       - name: Musl
         run: |
           sudo apt-get -y install musl musl-tools
           musl-gcc -v
 
-      - name: Install Rust ${{ github.event.inputs.rust_version }}
+      - name: Install Rust ${{ steps.variables.outputs.rust_version }}
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ github.event.inputs.rust_version }}
+          toolchain: ${{ steps.variables.outputs.rust_version }}
           components: rustfmt, clippy
           targets: x86_64-unknown-linux-musl
 
-      - name: Set build target for cache
-        id: setup_cache_target
-        run: echo "build_target=${CARGO_BUILD_TARGET:-x86_64-unknown-linux-musl}" >> $GITHUB_OUTPUT
-
       - name: Load local cache
         continue-on-error: true
         run:
           # Uncomment line if you want need to clear cache
-          # rm -rf "/opt/yagna_cache/${{ github.event.inputs.rust_version }}/${{ github.event.inputs.build_profile }}/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target"
-          cp -rp "/opt/yagna_cache/${{ github.event.inputs.rust_version }}/${{ github.event.inputs.build_profile }}/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target" target
+          # rm -rf "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
+          cp -rp "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target" target
 
       - name: Build binaries
         run: |
-          cargo build --profile ${{ github.event.inputs.build_profile }} --features static-openssl --target x86_64-unknown-linux-musl -p yagna -p ya-exe-unit -p gftp -p golemsp -p ya-provider
+          cargo build --profile ${{ steps.variables.outputs.build_profile }} --features static-openssl --target x86_64-unknown-linux-musl -p yagna -p ya-exe-unit -p gftp -p golemsp -p ya-provider
 
-      - name: Copy binaries
-        shell: bash
+      - name: Copy and strip target binaries
         run: |
           mkdir build
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            cp target/x86_64-unknown-linux-musl/debug/{yagna,ya-provider,exe-unit,golemsp,gftp} build
-            strip -x build/*
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            cp target/debug/{yagna,gftp} build
-            strip -x build/*
-          elif [ "$RUNNER_OS" == "Windows" ]; then
-            cp target/debug/{yagna,gftp}.exe build
-          else
-            echo "$RUNNER_OS not supported"
-            exit 1
-          fi
+          cp target/x86_64-unknown-linux-musl/${{ steps.variables.outputs.build_profile }}/{yagna,ya-provider,exe-unit,golemsp,gftp} build
+          strip -x build/*
 
       - name: Upload binaries
         uses: actions/upload-artifact@v3
@@ -95,5 +84,5 @@ jobs:
       - name: Save local cache
         run: |
           # copy to /opt/yagna_cache and preserve permissions and timestamps
-          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ github.event.inputs.rust_version }}/${{ github.event.inputs.build_profile }}/${{ steps.extract_branch.outputs.branch }}/binaries_x86/target"
+          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
 

From 6f6c87283d30981b11ab3a313c25e97a2986332c Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:37:59 +0200
Subject: [PATCH 05/33] f

---
 .github/workflows/binaries-x86-64.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 883e32c49c..0ede4725fc 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -43,8 +43,8 @@ jobs:
         id: variables
         run: |
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-          echo "build_profile=${{ github.event.inputs.profile || debug }}" >> $GITHUB_OUTPUT
-          echo "rust_version=${{ github.event.inputs.rust_version || 1.71.1 }}" >> $GITHUB_OUTPUT
+          echo "build_profile=${{ github.event.inputs.profile || 'debug' }}" >> $GITHUB_OUTPUT
+          echo "rust_version=${{ github.event.inputs.rust_version || '1.71.1' }}" >> $GITHUB_OUTPUT
 
       - name: Musl
         run: |

From 1aa28dc0fa4de601766f25f85d841241d771f110 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:44:33 +0200
Subject: [PATCH 06/33] f

---
 .github/workflows/binaries-x86-64.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 0ede4725fc..c370ac7c08 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       profile:
-        description: 'Build profile'
+        description: 'Rust flags'
         required: true
-        default: 'debug'
+        default: '-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1'
       rust_version:
         description: 'Rust version'
         required: true
@@ -20,7 +20,7 @@ on:
       - '**/integration-tests'
     inputs:
       profile:
-        default: 'debug'
+        default: 'dev'
       rust_version:
   pull_request:
     branches:
@@ -32,8 +32,7 @@ jobs:
   build:
     name: Build binaries (x86-64)
     env:
-      # `-D warnings` means any warnings emitted will cause build to fail
-      RUSTFLAGS: "-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1"
+      RUSTFLAGS: ${{ github.event.inputs.profile || '-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1' }}
     runs-on: [yagna-builder, ubuntu-22.04]
     steps:
       - name: Checkout
@@ -43,7 +42,6 @@ jobs:
         id: variables
         run: |
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-          echo "build_profile=${{ github.event.inputs.profile || 'debug' }}" >> $GITHUB_OUTPUT
           echo "rust_version=${{ github.event.inputs.rust_version || '1.71.1' }}" >> $GITHUB_OUTPUT
 
       - name: Musl
@@ -63,7 +61,7 @@ jobs:
         run:
           # Uncomment line if you want need to clear cache
           # rm -rf "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
-          cp -rp "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target" target
+          cp -rp "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/binaries_x86/target" target
 
       - name: Build binaries
         run: |
@@ -72,7 +70,7 @@ jobs:
       - name: Copy and strip target binaries
         run: |
           mkdir build
-          cp target/x86_64-unknown-linux-musl/${{ steps.variables.outputs.build_profile }}/{yagna,ya-provider,exe-unit,golemsp,gftp} build
+          mv target/x86_64-unknown-linux-musl/debug/{yagna,ya-provider,exe-unit,golemsp,gftp} build
           strip -x build/*
 
       - name: Upload binaries
@@ -84,5 +82,5 @@ jobs:
       - name: Save local cache
         run: |
           # copy to /opt/yagna_cache and preserve permissions and timestamps
-          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
+          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
 

From 62c1a00bc0a9a20a8c96cf33fc50ac9e87f4f503 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:45:13 +0200
Subject: [PATCH 07/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index c370ac7c08..79415eb750 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -65,7 +65,7 @@ jobs:
 
       - name: Build binaries
         run: |
-          cargo build --profile ${{ steps.variables.outputs.build_profile }} --features static-openssl --target x86_64-unknown-linux-musl -p yagna -p ya-exe-unit -p gftp -p golemsp -p ya-provider
+          cargo build --features static-openssl --target x86_64-unknown-linux-musl -p yagna -p ya-exe-unit -p gftp -p golemsp -p ya-provider
 
       - name: Copy and strip target binaries
         run: |

From 8c635aaf478c7f393ffa4d518b52cccbb3cf083e Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:50:35 +0200
Subject: [PATCH 08/33] f

---
 .github/workflows/binaries-x86-64.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 79415eb750..b3a29fc37f 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -33,7 +33,7 @@ jobs:
     name: Build binaries (x86-64)
     env:
       RUSTFLAGS: ${{ github.event.inputs.profile || '-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1' }}
-    runs-on: [yagna-builder, ubuntu-22.04]
+    runs-on: [ yagna-builder, ubuntu-22.04 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -43,6 +43,7 @@ jobs:
         run: |
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
           echo "rust_version=${{ github.event.inputs.rust_version || '1.71.1' }}" >> $GITHUB_OUTPUT
+          echo "rust_flags_md5=${RUSTFLAGS} | md5sum | awk '{print $1}'" >> $GITHUB_OUTPUT
 
       - name: Musl
         run: |
@@ -60,8 +61,8 @@ jobs:
         continue-on-error: true
         run:
           # Uncomment line if you want need to clear cache
-          # rm -rf "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
-          cp -rp "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/binaries_x86/target" target
+          # rm -rf "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.rust_flags_md5 }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
+          cp -rp "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.rust_flags_md5 }}/${{ steps.variables.outputs.branch }}/binaries_x86/target" target
 
       - name: Build binaries
         run: |
@@ -82,5 +83,5 @@ jobs:
       - name: Save local cache
         run: |
           # copy to /opt/yagna_cache and preserve permissions and timestamps
-          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
+          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.rust_flags_md5 }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
 

From b3419084a89f1d47fb135e9959ca44717f131731 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:52:51 +0200
Subject: [PATCH 09/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index b3a29fc37f..9062344efe 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -43,7 +43,7 @@ jobs:
         run: |
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
           echo "rust_version=${{ github.event.inputs.rust_version || '1.71.1' }}" >> $GITHUB_OUTPUT
-          echo "rust_flags_md5=${RUSTFLAGS} | md5sum | awk '{print $1}'" >> $GITHUB_OUTPUT
+          echo "rust_flags_md5=`${RUSTFLAGS} | md5sum | awk '{print $1}'`" >> $GITHUB_OUTPUT
 
       - name: Musl
         run: |

From 4872dd26db3d462bec46a1a28ec10d56e2fb8241 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:54:30 +0200
Subject: [PATCH 10/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 9062344efe..909fd648e0 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -43,7 +43,7 @@ jobs:
         run: |
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
           echo "rust_version=${{ github.event.inputs.rust_version || '1.71.1' }}" >> $GITHUB_OUTPUT
-          echo "rust_flags_md5=`${RUSTFLAGS} | md5sum | awk '{print $1}'`" >> $GITHUB_OUTPUT
+          echo "rust_flags_md5=`${RUSTFLAGS} | md5sum | head -c 10`" >> $GITHUB_OUTPUT
 
       - name: Musl
         run: |

From 1b5b26445cf618c57d58822fc5e421423f173a74 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 16:56:57 +0200
Subject: [PATCH 11/33] f

---
 .github/workflows/binaries-x86-64.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 909fd648e0..0df8767f4b 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -61,8 +61,8 @@ jobs:
         continue-on-error: true
         run:
           # Uncomment line if you want need to clear cache
-          # rm -rf "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.rust_flags_md5 }}/${{ steps.variables.outputs.build_profile }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
-          cp -rp "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.rust_flags_md5 }}/${{ steps.variables.outputs.branch }}/binaries_x86/target" target
+          # rm -rf "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target"
+          cp -rp "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target" target
 
       - name: Build binaries
         run: |
@@ -83,5 +83,5 @@ jobs:
       - name: Save local cache
         run: |
           # copy to /opt/yagna_cache and preserve permissions and timestamps
-          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.rust_flags_md5 }}/${{ steps.variables.outputs.branch }}/binaries_x86/target"
+          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target"
 

From a5f6f51301744dcaa91822be349f0a2eb266f238 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 17:14:17 +0200
Subject: [PATCH 12/33] update actions 2

---
 .github/workflows/integration-test.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 4b174850ad..f56e123dc0 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -3,10 +3,9 @@ name: Goth integration tests (hybrid-net)
 on:
   workflow_dispatch:
     inputs:
-      profile:
-        description: 'Profile (unused right now)'
+      artifacts:
+        description: 'Binaries zip file url'
         required: true
-        default: 'debug'
   push:
     branches:
       - master
@@ -24,6 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Wait for build to succeed ( ubuntu )
+        if: github.event_name != 'workflow_dispatch'
         uses: tomchv/wait-my-workflow@v1.1.0
         id: wait-for-build-ubu
         with:
@@ -34,6 +34,7 @@ jobs:
           timeoutSeconds: 3600
 
       - name: Fail if build was not a success ( ubuntu )
+        if: github.event_name != 'workflow_dispatch'
         run: echo job status= ${{ steps.wait-for-build-ubu.outputs.conclusion }} && ${{ fromJSON('["false", "true"]')[steps.wait-for-build-ubu.outputs.conclusion == 'success'] }}
 
   integration-test-groups:

From 66ed72d8c063bb796bb0c9ae26b1f31b30ed8b36 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 17:20:47 +0200
Subject: [PATCH 13/33] f

---
 .github/workflows/integration-test.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index f56e123dc0..53e6f99670 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -80,6 +80,7 @@ jobs:
         run: echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u ${{github.actor}} --password-stdin
 
       - name: Download artifact
+        if: github.event_name != 'workflow_dispatch'
         uses: dawidd6/action-download-artifact@v2
         with:
           workflow: binaries-x86-64.yml
@@ -88,6 +89,13 @@ jobs:
           name: "Yagna Linux"
           path: /tmp/yagna-build
 
+      - name: Download artifact from given url
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          rm -rf /tmp/yagna-build
+          curl -L ${{ github.event.inputs.artifacts }} -o /tmp/yagna-build.zip
+          unzip /tmp/yagna-build.zip -d /tmp/yagna-build
+
       - name: Run test suite
         env:
           GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 842b52e262dcd25f9a484e33b9ea0c66106f02b1 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 17:32:10 +0200
Subject: [PATCH 14/33] f

---
 .github/workflows/integration-test.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 53e6f99670..062396ce06 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -3,8 +3,8 @@ name: Goth integration tests (hybrid-net)
 on:
   workflow_dispatch:
     inputs:
-      artifacts:
-        description: 'Binaries zip file url'
+      workflow_number:
+        description: 'Id of workflow binaries-x86-64 to get binaries from'
         required: true
   push:
     branches:
@@ -89,12 +89,14 @@ jobs:
           name: "Yagna Linux"
           path: /tmp/yagna-build
 
-      - name: Download artifact from given url
+      - name: Download artifact from given run id
         if: github.event_name == 'workflow_dispatch'
-        run: |
-          rm -rf /tmp/yagna-build
-          curl -L ${{ github.event.inputs.artifacts }} -o /tmp/yagna-build.zip
-          unzip /tmp/yagna-build.zip -d /tmp/yagna-build
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          run_id: ${{github.event.inputs.workflow_number}}
+          workflow_conclusion: success
+          name: "Yagna Linux"
+          path: /tmp/yagna-build
 
       - name: Run test suite
         env:

From 4a243ff004c6524e27eb9927ed426a12d7027708 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 17:38:18 +0200
Subject: [PATCH 15/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 0df8767f4b..20add6ed79 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -62,7 +62,7 @@ jobs:
         run:
           # Uncomment line if you want need to clear cache
           # rm -rf "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target"
-          cp -rp "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target" target
+          rsync -a --ignore-errors "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target" target
 
       - name: Build binaries
         run: |

From dced8eba12e571439867fee533de263b71fb68b8 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 17:44:45 +0200
Subject: [PATCH 16/33] f

---
 .github/workflows/binaries-x86-64.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 20add6ed79..1e4e929c5f 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -58,11 +58,15 @@ jobs:
           targets: x86_64-unknown-linux-musl
 
       - name: Load local cache
+        id: cache_action
         continue-on-error: true
+        env:
+          cache_dir: /opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target
         run:
           # Uncomment line if you want need to clear cache
-          # rm -rf "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target"
-          rsync -a --ignore-errors "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target" target
+          # rm -rf "$cache_dir"
+          mkdir -p "$cache_dir" && cp -rp "$cache_dir" target
+
 
       - name: Build binaries
         run: |
@@ -83,5 +87,5 @@ jobs:
       - name: Save local cache
         run: |
           # copy to /opt/yagna_cache and preserve permissions and timestamps
-          rsync -a --delete --mkpath target/ "/opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target"
+          rsync -a --delete --mkpath target/ "${{ steps.cache_action.outputs.cache_dir }}"
 

From 7e829786599b913c7c9a23a80bf808314a3b1d79 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 17:48:41 +0200
Subject: [PATCH 17/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 1e4e929c5f..c82e364015 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -66,7 +66,7 @@ jobs:
           # Uncomment line if you want need to clear cache
           # rm -rf "$cache_dir"
           mkdir -p "$cache_dir" && cp -rp "$cache_dir" target
-
+          echo "cache_dir=$cache_dir" >> $GITHUB_OUTPUT
 
       - name: Build binaries
         run: |

From 93d0343077bf07a89fd91db4cba27f737b53dfb4 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 17:53:18 +0200
Subject: [PATCH 18/33] f

---
 .github/workflows/binaries-x86-64.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index c82e364015..bedf21b57b 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -3,7 +3,7 @@ name: Build binaries (x86-64)
 on:
   workflow_dispatch:
     inputs:
-      profile:
+      rust_flags:
         description: 'Rust flags'
         required: true
         default: '-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1'
@@ -11,6 +11,11 @@ on:
         description: 'Rust version'
         required: true
         default: '1.71.1'
+      strip_binaries:
+        description: 'Strip binaries'
+        required: true
+        default: 'true'
+        possible_values: ['true', 'false']
   push:
     branches:
       - master
@@ -18,10 +23,6 @@ on:
       - p2p-stability
       - '**/all-tests'
       - '**/integration-tests'
-    inputs:
-      profile:
-        default: 'dev'
-      rust_version:
   pull_request:
     branches:
       - master
@@ -32,7 +33,7 @@ jobs:
   build:
     name: Build binaries (x86-64)
     env:
-      RUSTFLAGS: ${{ github.event.inputs.profile || '-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1' }}
+      RUSTFLAGS: ${{ github.event.inputs.rust_flags || '-C opt-level=z -C target-cpu=x86-64 -C debuginfo=1' }}
     runs-on: [ yagna-builder, ubuntu-22.04 ]
     steps:
       - name: Checkout
@@ -72,10 +73,14 @@ jobs:
         run: |
           cargo build --features static-openssl --target x86_64-unknown-linux-musl -p yagna -p ya-exe-unit -p gftp -p golemsp -p ya-provider
 
-      - name: Copy and strip target binaries
+      - name: Move target binaries
         run: |
           mkdir build
           mv target/x86_64-unknown-linux-musl/debug/{yagna,ya-provider,exe-unit,golemsp,gftp} build
+
+      - name: Strip binaries
+        if: ${{ github.event.inputs.strip_binaries != 'false' }}
+        run: |
           strip -x build/*
 
       - name: Upload binaries

From 31499cea0cb648d613d30c6f6aaa43a2c0b1ae00 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 18:04:38 +0200
Subject: [PATCH 19/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index bedf21b57b..5d2a1b8a6d 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -66,7 +66,7 @@ jobs:
         run:
           # Uncomment line if you want need to clear cache
           # rm -rf "$cache_dir"
-          mkdir -p "$cache_dir" && cp -rp "$cache_dir" target
+          [ -d "$cache_dir" ] && cp -rp "$cache_dir" target
           echo "cache_dir=$cache_dir" >> $GITHUB_OUTPUT
 
       - name: Build binaries

From 091e0e0bf2cef0494722bca0bc3b301fc3177558 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 18:06:20 +0200
Subject: [PATCH 20/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 5d2a1b8a6d..84102c959b 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -66,7 +66,7 @@ jobs:
         run:
           # Uncomment line if you want need to clear cache
           # rm -rf "$cache_dir"
-          [ -d "$cache_dir" ] && cp -rp "$cache_dir" target
+          cp -rp "$cache_dir" target || echo "No local cache found"
           echo "cache_dir=$cache_dir" >> $GITHUB_OUTPUT
 
       - name: Build binaries

From d393336dee3580abe5e14148e8dd91d2e9b5de82 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 18:08:40 +0200
Subject: [PATCH 21/33] f

---
 .github/workflows/binaries-x86-64.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 84102c959b..ef4f34ccec 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -60,7 +60,6 @@ jobs:
 
       - name: Load local cache
         id: cache_action
-        continue-on-error: true
         env:
           cache_dir: /opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target
         run:

From 8088dcc117037ac30d50a7f33681be6b31d79d48 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 18:13:28 +0200
Subject: [PATCH 22/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index ef4f34ccec..8d914030df 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -62,7 +62,7 @@ jobs:
         id: cache_action
         env:
           cache_dir: /opt/yagna_cache/${{ steps.variables.outputs.rust_version }}/${{ steps.variables.outputs.branch }}/${{ steps.variables.outputs.rust_flags_md5 }}/binaries_x86/target
-        run:
+        run: |
           # Uncomment line if you want need to clear cache
           # rm -rf "$cache_dir"
           cp -rp "$cache_dir" target || echo "No local cache found"

From c076b80491a3bb57fd8bbaf759d1df640f32b4b1 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 18:21:11 +0200
Subject: [PATCH 23/33] f

---
 .github/workflows/binaries-x86-64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
index 8d914030df..d05978f425 100644
--- a/.github/workflows/binaries-x86-64.yml
+++ b/.github/workflows/binaries-x86-64.yml
@@ -44,7 +44,7 @@ jobs:
         run: |
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
           echo "rust_version=${{ github.event.inputs.rust_version || '1.71.1' }}" >> $GITHUB_OUTPUT
-          echo "rust_flags_md5=`${RUSTFLAGS} | md5sum | head -c 10`" >> $GITHUB_OUTPUT
+          echo "rust_flags_md5=`echo ${RUSTFLAGS} | md5sum | head -c 10`" >> $GITHUB_OUTPUT
 
       - name: Musl
         run: |

From 29ae004a7d4164d75cc14ebf25219c5b417b7266 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Fri, 29 Sep 2023 19:07:11 +0200
Subject: [PATCH 24/33] fix e2e test

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index 12ef09626b..cd76bd9db9 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -95,7 +95,7 @@ async def test_e2e_outbound_perf(
             if 'outbound-test' in info.aliases:
                 server_addr = info.address
                 break
-        assert(server_addr is not None, "Can't find container `outbound-test`")
+        assert(server_addr is not None, f"Can't find container `outbound-test` {runner.get_container_info().values()}")
         logger.info("outbound-test container found at %s", server_addr)
 
         requestor = runner.get_probes(probe_type=RequestorProbe)[0]

From 32e93794cdbae7388f768839e14799fda3b72930 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Sat, 30 Sep 2023 11:04:00 +0200
Subject: [PATCH 25/33] fixe2e

---
 .github/workflows/integration-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 062396ce06..57a2a33dbe 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -39,7 +39,7 @@ jobs:
 
   integration-test-groups:
     name: Integration Tests (hybrid-net) group
-    runs-on: [goth2, ubuntu-22.10]
+    runs-on: [goth2]
     needs: test_check
     strategy:
       fail-fast: false

From 3d8e0110602ea9a5efe6b78d7e4b162f412f3259 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Sun, 1 Oct 2023 21:43:32 +0200
Subject: [PATCH 26/33] f

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index cd76bd9db9..891786fbe5 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -91,10 +91,13 @@ async def test_e2e_outbound_perf(
 
     async with runner(goth_config.containers):
         server_addr = None
+        print(runner.get_container_info().values())
         for info in runner.get_container_info().values():
             if 'outbound-test' in info.aliases:
                 server_addr = info.address
                 break
+        print(runner.get_container_info().values())
+
         assert(server_addr is not None, f"Can't find container `outbound-test` {runner.get_container_info().values()}")
         logger.info("outbound-test container found at %s", server_addr)
 

From deb2d0a81fa7719c5a0b9c4608feb3735759eb3a Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech@gmail.com>
Date: Mon, 2 Oct 2023 11:31:55 +0000
Subject: [PATCH 27/33] d

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index 891786fbe5..3935f54805 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -91,8 +91,9 @@ async def test_e2e_outbound_perf(
 
     async with runner(goth_config.containers):
         server_addr = None
-        print(runner.get_container_info().values())
+        print("Runner starting")
         for info in runner.get_container_info().values():
+            print(f"  {info.aliases}")
             if 'outbound-test' in info.aliases:
                 server_addr = info.address
                 break

From 976c9c6f49bc8000ba959099906a1ddd9ee2b003 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Mon, 2 Oct 2023 13:44:21 +0200
Subject: [PATCH 28/33] f

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index 891786fbe5..519e0b3019 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -96,9 +96,7 @@ async def test_e2e_outbound_perf(
             if 'outbound-test' in info.aliases:
                 server_addr = info.address
                 break
-        print(runner.get_container_info().values())
-
-        assert(server_addr is not None, f"Can't find container `outbound-test` {runner.get_container_info().values()}")
+        assert(server_addr is not None, "Can't find container `outbound-test`")
         logger.info("outbound-test container found at %s", server_addr)
 
         requestor = runner.get_probes(probe_type=RequestorProbe)[0]

From 23be8027979c9592c4f299e2dcd5bdd6b43ff06c Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Mon, 2 Oct 2023 14:23:52 +0200
Subject: [PATCH 29/33] f

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index c2c336070a..c64b046fb9 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -91,12 +91,14 @@ async def test_e2e_outbound_perf(
 
     async with runner(goth_config.containers):
         server_addr = None
-        print("Runner starting")
-        for info in runner.get_container_info().values():
-            print(f"  {info.aliases}")
-            if 'outbound-test' in info.aliases:
-                server_addr = info.address
-                break
+        for i in range(0, 5):
+            print("Runner starting {}/5".format(i))
+            for info in runner.get_container_info().values():
+                print(f"  -- {info.aliases}")
+                if 'outbound-test' in info.aliases:
+                    server_addr = info.address
+                    break
+                await asyncio.sleep(1)
         assert(server_addr is not None, "Can't find container `outbound-test`")
         logger.info("outbound-test container found at %s", server_addr)
 

From 49acfe41fdcd09b23d4f62f7a7c26c9f92c0a249 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Mon, 2 Oct 2023 14:31:09 +0200
Subject: [PATCH 30/33] f

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index c64b046fb9..c1a1ab82e5 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -1,5 +1,5 @@
 """End to end tests for requesting VM tasks using goth REST API client."""
-
+import asyncio
 import json
 import logging
 import os

From a18606899682c5bfe59c0a9f8df136296dbbc114 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Mon, 2 Oct 2023 14:46:01 +0200
Subject: [PATCH 31/33] f

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index c1a1ab82e5..352a7bc014 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -97,7 +97,6 @@ async def test_e2e_outbound_perf(
                 print(f"  -- {info.aliases}")
                 if 'outbound-test' in info.aliases:
                     server_addr = info.address
-                    break
                 await asyncio.sleep(1)
         assert(server_addr is not None, "Can't find container `outbound-test`")
         logger.info("outbound-test container found at %s", server_addr)

From b039e9bff13de664916ad9c485795f0d80c409c9 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Mon, 2 Oct 2023 21:51:21 +0200
Subject: [PATCH 32/33] Update test_e2e_outbound_perf.py

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index a2b3c04bde..818e5e2e6f 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -1,5 +1,4 @@
 """End to end tests for requesting VM tasks using goth REST API client."""
-import asyncio
 import json
 import logging
 import os

From 87c81243ee163e28037ca0dfcc7c51340458ca94 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Mon, 2 Oct 2023 21:51:42 +0200
Subject: [PATCH 33/33] Update test_e2e_outbound_perf.py

---
 goth_tests/e2e/vm/test_e2e_outbound_perf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/goth_tests/e2e/vm/test_e2e_outbound_perf.py b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
index 818e5e2e6f..967182e75d 100644
--- a/goth_tests/e2e/vm/test_e2e_outbound_perf.py
+++ b/goth_tests/e2e/vm/test_e2e_outbound_perf.py
@@ -1,4 +1,5 @@
 """End to end tests for requesting VM tasks using goth REST API client."""
+
 import json
 import logging
 import os