From 7b57f1ba385d01408f1585cadc05845d4af27c4d Mon Sep 17 00:00:00 2001
From: acud <12988138+acud@users.noreply.github.com>
Date: Sat, 2 Oct 2021 09:27:05 +0100
Subject: [PATCH] ci: housekeeping

---
 .github/workflows/beekeeper-clef.yml          | 25 ++++-----------
 .../beekeeper-storage-incentives.yml          | 22 +++----------
 .github/workflows/beekeeper.yml               | 32 ++++++++-----------
 3 files changed, 23 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/beekeeper-clef.yml b/.github/workflows/beekeeper-clef.yml
index f4947988d63..f7fb32348ac 100644
--- a/.github/workflows/beekeeper-clef.yml
+++ b/.github/workflows/beekeeper-clef.yml
@@ -64,13 +64,13 @@ jobs:
           make beelocal ACTION=add-hosts
           timeout 10m make deploylocal BEEKEEPER_CLUSTER=local-clef
       - name: Test pingpong
-        id: pingpong-2
+        id: pingpong
         run: until beekeeper check --cluster-name local-clef --checks ci-pingpong; do echo "waiting for pingpong..."; sleep .3; done
       - name: Test fullconnectivity
-        id: fullconnectivity-2
+        id: fullconnectivity
         run: beekeeper check --cluster-name local-clef --checks=ci-full-connectivity
       - name: Test settlements
-        id: settlements-2
+        id: settlements
         run: beekeeper check --cluster-name local-clef --checks=ci-settlements-clef
       - name: Destroy the cluster
         run: |
@@ -113,24 +113,11 @@ jobs:
           export VERTAG=$(< /dev/urandom tr -dc A-Z-a-z-0-9 2> /dev/null | head -c15)
           bash .github/bin/beekeeper_artifacts.sh
           export FAILED='no-test'
-          if ${{ steps.pingpong-1.outcome=='failure' }}; then FAILED=pingpong-1; fi
-          if ${{ steps.fullconnectivity-1.outcome=='failure' }}; then FAILED=fullconnectivity-1; fi
-          if ${{ steps.settlements-1.outcome=='failure' }}; then FAILED=settlements-1; fi
-          if ${{ steps.pushsync-chunks-1.outcome=='failure' }}; then FAILED=pushsync-chunks-1; fi
-          if ${{ steps.retrieval-1.outcome=='failure' }}; then FAILED=retrieval-1; fi
-          if ${{ steps.manifest-1.outcome=='failure' }}; then FAILED=manifest-1; fi
-          if ${{ steps.content-availability.outcome=='failure' }}; then FAILED=content-availability; fi
-          if ${{ steps.pingpong-2.outcome=='failure' }}; then FAILED=pingpong-2; fi
-          if ${{ steps.fullconnectivity-2.outcome=='failure' }}; then FAILED=fullconnectivity-2; fi
-          if ${{ steps.settlements-2.outcome=='failure' }}; then FAILED=settlements-2; fi
-          if ${{ steps.pss.outcome=='failure' }}; then FAILED=pss; fi
-          if ${{ steps.soc.outcome=='failure' }}; then FAILED=soc; fi
-          if ${{ steps.pingpong-3.outcome=='failure' }}; then FAILED=pingpong-3; fi
-          if ${{ steps.gc-chunk-1.outcome=='failure' }}; then FAILED=gc-chunk-1; fi
+          if ${{ steps.pingpong.outcome=='failure' }}; then FAILED=pingpong; fi
+          if ${{ steps.fullconnectivity.outcome=='failure' }}; then FAILED=fullconnectivity; fi
+          if ${{ steps.settlements.outcome=='failure' }}; then FAILED=settlements; fi
           KEYS=$(curl -sSf -X POST https://eu.relay.tunshell.com/api/sessions)
           curl -sSf -X POST -H "Content-Type: application/json" -d "{\"text\": \"**${RUN_TYPE}** Beekeeper Error\nBranch: \`${{ github.head_ref }}\`\nUser: @${{ github.event.pull_request.user.login }}\nDebugging artifacts: [click](https://$BUCKET_NAME.$AWS_ENDPOINT/artifacts_$VERTAG.tar.gz)\nStep failed: \`${FAILED}\`\nDebug shell: \`sh <(curl -sSf https://lets.tunshell.com/init.sh) L $(echo $KEYS | jq -r .peer2_key) \${TUNSHELL_SECRET} eu.relay.tunshell.com\`\"}" https://beehive.ethswarm.org/hooks/${{ secrets.WEBHOOK_KEY }}
-          echo "run the debug shell and run the following to get debugging artifacts:"
-          echo "curl -s -o debug.sh https://gist.githubusercontent.com/acud/2c219531e832aafbab51feffe5b5e91f/raw/304880f1f8cc819e577d1dd3f1f45df8709c543d/beekeeper_artifacts.sh | bash"
           echo "Failed test: ${FAILED}"
           echo "Connect to github actions node using"
           echo "sh <(curl -sSf https://lets.tunshell.com/init.sh) L $(echo $KEYS | jq -r .peer2_key) \${TUNSHELL_SECRET} eu.relay.tunshell.com"
diff --git a/.github/workflows/beekeeper-storage-incentives.yml b/.github/workflows/beekeeper-storage-incentives.yml
index 8f09d5f425e..e06c56f4b12 100644
--- a/.github/workflows/beekeeper-storage-incentives.yml
+++ b/.github/workflows/beekeeper-storage-incentives.yml
@@ -64,10 +64,10 @@ jobs:
         run: |
           timeout 10m make deploylocal BEEKEEPER_CLUSTER=local-gc
       - name: Test pingpong
-        id: pingpong-3
+        id: pingpong
         run: until beekeeper check --cluster-name local-gc --checks ci-pingpong; do echo "waiting for pingpong..."; sleep .3; done
       - name: Test gc
-        id: gc-chunk-1
+        id: gc-chunk
         run: beekeeper check --cluster-name local-gc --checks=ci-gc
       - name: Destroy the cluster
         run: |
@@ -110,24 +110,10 @@ jobs:
           export VERTAG=$(< /dev/urandom tr -dc A-Z-a-z-0-9 2> /dev/null | head -c15)
           bash .github/bin/beekeeper_artifacts.sh
           export FAILED='no-test'
-          if ${{ steps.pingpong-1.outcome=='failure' }}; then FAILED=pingpong-1; fi
-          if ${{ steps.fullconnectivity-1.outcome=='failure' }}; then FAILED=fullconnectivity-1; fi
-          if ${{ steps.settlements-1.outcome=='failure' }}; then FAILED=settlements-1; fi
-          if ${{ steps.pushsync-chunks-1.outcome=='failure' }}; then FAILED=pushsync-chunks-1; fi
-          if ${{ steps.retrieval-1.outcome=='failure' }}; then FAILED=retrieval-1; fi
-          if ${{ steps.manifest-1.outcome=='failure' }}; then FAILED=manifest-1; fi
-          if ${{ steps.content-availability.outcome=='failure' }}; then FAILED=content-availability; fi
-          if ${{ steps.pingpong-2.outcome=='failure' }}; then FAILED=pingpong-2; fi
-          if ${{ steps.fullconnectivity-2.outcome=='failure' }}; then FAILED=fullconnectivity-2; fi
-          if ${{ steps.settlements-2.outcome=='failure' }}; then FAILED=settlements-2; fi
-          if ${{ steps.pss.outcome=='failure' }}; then FAILED=pss; fi
-          if ${{ steps.soc.outcome=='failure' }}; then FAILED=soc; fi
-          if ${{ steps.pingpong-3.outcome=='failure' }}; then FAILED=pingpong-3; fi
-          if ${{ steps.gc-chunk-1.outcome=='failure' }}; then FAILED=gc-chunk-1; fi
+          if ${{ steps.pingpong.outcome=='failure' }}; then FAILED=pingpong; fi
+          if ${{ steps.gc-chunk.outcome=='failure' }}; then FAILED=gc-chunk; fi
           KEYS=$(curl -sSf -X POST https://eu.relay.tunshell.com/api/sessions)
           curl -sSf -X POST -H "Content-Type: application/json" -d "{\"text\": \"**${RUN_TYPE}** Beekeeper Error\nBranch: \`${{ github.head_ref }}\`\nUser: @${{ github.event.pull_request.user.login }}\nDebugging artifacts: [click](https://$BUCKET_NAME.$AWS_ENDPOINT/artifacts_$VERTAG.tar.gz)\nStep failed: \`${FAILED}\`\nDebug shell: \`sh <(curl -sSf https://lets.tunshell.com/init.sh) L $(echo $KEYS | jq -r .peer2_key) \${TUNSHELL_SECRET} eu.relay.tunshell.com\`\"}" https://beehive.ethswarm.org/hooks/${{ secrets.WEBHOOK_KEY }}
-          echo "run the debug shell and run the following to get debugging artifacts:"
-          echo "curl -s -o debug.sh https://gist.githubusercontent.com/acud/2c219531e832aafbab51feffe5b5e91f/raw/304880f1f8cc819e577d1dd3f1f45df8709c543d/beekeeper_artifacts.sh | bash"
           echo "Failed test: ${FAILED}"
           echo "Connect to github actions node using"
           echo "sh <(curl -sSf https://lets.tunshell.com/init.sh) L $(echo $KEYS | jq -r .peer2_key) \${TUNSHELL_SECRET} eu.relay.tunshell.com"
diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
index 0c34e18b62a..483d254b5b1 100644
--- a/.github/workflows/beekeeper.yml
+++ b/.github/workflows/beekeeper.yml
@@ -64,13 +64,13 @@ jobs:
           make beelocal ACTION=add-hosts
           timeout 10m make deploylocal BEEKEEPER_CLUSTER=local-dns
       - name: Test pingpong
-        id: pingpong-1
+        id: pingpong
         run: until beekeeper check --cluster-name local-dns --checks ci-pingpong; do echo "waiting for pingpong..."; sleep .3; done
       - name: Test fullconnectivity
-        id: fullconnectivity-1
+        id: fullconnectivity
         run: beekeeper check --cluster-name local-dns --checks=ci-full-connectivity
       - name: Test settlements
-        id: settlements-1
+        id: settlements
         run: beekeeper check --cluster-name local-dns --checks=ci-settlements
       - name: Sleep for time allowance to replenish
         run: sleep 2
@@ -87,10 +87,10 @@ jobs:
         id: pushsync-chunks-2
         run: beekeeper check --cluster-name local-dns --checks=ci-pushsync-light-chunks
       - name: Test retrieval
-        id: retrieval-1
+        id: retrieval
         run: beekeeper check --cluster-name local-dns --checks=ci-retrieval
       - name: Test manifest
-        id: manifest-1
+        id: manifest
         run: beekeeper check --cluster-name local-dns --checks=ci-manifest
       - name: Test content availability
         id: content-availability
@@ -136,24 +136,18 @@ jobs:
           export VERTAG=$(< /dev/urandom tr -dc A-Z-a-z-0-9 2> /dev/null | head -c15)
           bash .github/bin/beekeeper_artifacts.sh
           export FAILED='no-test'
-          if ${{ steps.pingpong-1.outcome=='failure' }}; then FAILED=pingpong-1; fi
-          if ${{ steps.fullconnectivity-1.outcome=='failure' }}; then FAILED=fullconnectivity-1; fi
-          if ${{ steps.settlements-1.outcome=='failure' }}; then FAILED=settlements-1; fi
-          if ${{ steps.pushsync-chunks-1.outcome=='failure' }}; then FAILED=pushsync-chunks-1; fi
-          if ${{ steps.retrieval-1.outcome=='failure' }}; then FAILED=retrieval-1; fi
-          if ${{ steps.manifest-1.outcome=='failure' }}; then FAILED=manifest-1; fi
-          if ${{ steps.content-availability.outcome=='failure' }}; then FAILED=content-availability; fi
-          if ${{ steps.pingpong-2.outcome=='failure' }}; then FAILED=pingpong-2; fi
-          if ${{ steps.fullconnectivity-2.outcome=='failure' }}; then FAILED=fullconnectivity-2; fi
-          if ${{ steps.settlements-2.outcome=='failure' }}; then FAILED=settlements-2; fi
+          if ${{ steps.pingpong.outcome=='failure' }}; then FAILED=pingpong; fi
+          if ${{ steps.fullconnectivity.outcome=='failure' }}; then FAILED=fullconnectivity; fi
+          if ${{ steps.settlements.outcome=='failure' }}; then FAILED=settlements; fi
           if ${{ steps.pss.outcome=='failure' }}; then FAILED=pss; fi
           if ${{ steps.soc.outcome=='failure' }}; then FAILED=soc; fi
-          if ${{ steps.pingpong-3.outcome=='failure' }}; then FAILED=pingpong-3; fi
-          if ${{ steps.gc-chunk-1.outcome=='failure' }}; then FAILED=gc-chunk-1; fi
+          if ${{ steps.pushsync-chunks-1.outcome=='failure' }}; then FAILED=pushsync-chunks-1; fi
+          if ${{ steps.pushsync-chunks-2.outcome=='failure' }}; then FAILED=pushsync-chunks-2; fi
+          if ${{ steps.retrieval.outcome=='failure' }}; then FAILED=retrieval; fi
+          if ${{ steps.manifest.outcome=='failure' }}; then FAILED=manifest; fi
+          if ${{ steps.content-availability.outcome=='failure' }}; then FAILED=content-availability; fi
           KEYS=$(curl -sSf -X POST https://eu.relay.tunshell.com/api/sessions)
           curl -sSf -X POST -H "Content-Type: application/json" -d "{\"text\": \"**${RUN_TYPE}** Beekeeper Error\nBranch: \`${{ github.head_ref }}\`\nUser: @${{ github.event.pull_request.user.login }}\nDebugging artifacts: [click](https://$BUCKET_NAME.$AWS_ENDPOINT/artifacts_$VERTAG.tar.gz)\nStep failed: \`${FAILED}\`\nDebug shell: \`sh <(curl -sSf https://lets.tunshell.com/init.sh) L $(echo $KEYS | jq -r .peer2_key) \${TUNSHELL_SECRET} eu.relay.tunshell.com\`\"}" https://beehive.ethswarm.org/hooks/${{ secrets.WEBHOOK_KEY }}
-          echo "run the debug shell and run the following to get debugging artifacts:"
-          echo "curl -s -o debug.sh https://gist.githubusercontent.com/acud/2c219531e832aafbab51feffe5b5e91f/raw/304880f1f8cc819e577d1dd3f1f45df8709c543d/beekeeper_artifacts.sh | bash"
           echo "Failed test: ${FAILED}"
           echo "Connect to github actions node using"
           echo "sh <(curl -sSf https://lets.tunshell.com/init.sh) L $(echo $KEYS | jq -r .peer2_key) \${TUNSHELL_SECRET} eu.relay.tunshell.com"