From e4855e352f972f59a2d5941d7bce2d5174ab34ee Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Wed, 9 Nov 2022 13:57:56 +0100
Subject: [PATCH] [ci] Fix publish benchmark results (#1840)

* [ci] Fix publish benchmark results

* Update scripts/ci/gitlab/pipeline/benchmarks.yml

Co-authored-by: Sergejs Kostjucenko <85877331+sergejparity@users.noreply.github.com>

* Update scripts/ci/gitlab/pipeline/benchmarks.yml

Co-authored-by: Sergejs Kostjucenko <85877331+sergejparity@users.noreply.github.com>

Co-authored-by: Sergejs Kostjucenko <85877331+sergejparity@users.noreply.github.com>
---
 scripts/ci/gitlab/pipeline/benchmarks.yml | 4 ++++
 scripts/ci/gitlab/pipeline/publish.yml    | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/gitlab/pipeline/benchmarks.yml b/scripts/ci/gitlab/pipeline/benchmarks.yml
index 09a0d7d2152..af512770248 100644
--- a/scripts/ci/gitlab/pipeline/benchmarks.yml
+++ b/scripts/ci/gitlab/pipeline/benchmarks.yml
@@ -29,6 +29,8 @@ benchmarks-assets:
     - export BRANCHNAME="weights-statemint-${CI_COMMIT_BRANCH}-${CURRENT_TIME}"
     - !reference [.git-commit-push, script]
     - ./scripts/ci/create-benchmark-pr.sh "[benchmarks] Update weights for statemine/t" "$BRANCHNAME"
+    - rm -f ./artifacts/polkadot-parachain
+    - rm -f ./artifacts/test-parachain
   after_script:
     - rm -rf .git/config
   tags:
@@ -48,6 +50,8 @@ benchmarks-collectives:
     - export BRANCHNAME="weights-collectives-${CI_COMMIT_BRANCH}-${CURRENT_TIME}"
     - !reference [.git-commit-push, script]
     - ./scripts/ci/create-benchmark-pr.sh "[benchmarks] Update weights for collectives" "$BRANCHNAME"
+    - rm -f ./artifacts/polkadot-parachain
+    - rm -f ./artifacts/test-parachain
   after_script:
     - rm -rf .git/config
   tags:
diff --git a/scripts/ci/gitlab/pipeline/publish.yml b/scripts/ci/gitlab/pipeline/publish.yml
index 5773bc2b066..1956dcb622f 100644
--- a/scripts/ci/gitlab/pipeline/publish.yml
+++ b/scripts/ci/gitlab/pipeline/publish.yml
@@ -87,10 +87,8 @@ publish-benchmarks-assets-s3:      &publish-benchmarks
   variables:
     GIT_STRATEGY:                  none
     BUCKET:                        "releases.parity.io"
-    PREFIX:                        "cumulus/$CI_COMMIT_REF_NAME/benchmarks"
+    PREFIX:                        "cumulus/$CI_COMMIT_REF_NAME/benchmarks-assets"
   script:
-    - echo "___Removing binary from artifacts___"
-    - rm -f ./artifacts/polkadot-parachain
     - echo "___Publishing benchmark results___"
     - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/
   after_script:
@@ -98,6 +96,10 @@ publish-benchmarks-assets-s3:      &publish-benchmarks
 
 publish-benchmarks-collectives-s3:
   <<:                              *publish-benchmarks
+  variables:
+    GIT_STRATEGY:                  none
+    BUCKET:                        "releases.parity.io"
+    PREFIX:                        "cumulus/$CI_COMMIT_REF_NAME/benchmarks-collectives"
   needs:
     - job:                         benchmarks-collectives
       artifacts:                   true