From cfdd85535f2eb516dfd320e685ed83c2ab523efe Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Tue, 30 Jan 2024 00:26:12 -0500
Subject: [PATCH] GHA: Prepare tcpdump to run for snapshot build and upload on
 the build failure

---
 .../workflows/eclipse-ls-extensions-build.yml | 20 +++++++++----------
 .../gh-hosted-eclipse-distro-build.yml        |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index 8d4941b69..f749ddda0 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -99,16 +99,16 @@ jobs:
           aws s3 cp ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/repository/ s3://tools-spring-io/${p2_path}/ --recursive --no-progress
           aws s3 rm s3://dist.springsource.com/${p2_path}/ --recursive
           aws s3 cp ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/repository/ s3://dist.springsource.com/${p2_path}/ --recursive --acl public-read --no-progress
-      - name: Verify Uploaded P2 Repo
-        id: verify-p2-on-akamai
-        run: |
-          p2_path=`cat ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/s3-p2-repo-dist-path.txt`
-          echo "Verifying uploaded to Akamai files..."
-          cd ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/repository/plugins
-          for f in `ls -p | grep -v '/$'`
-          do
-            wget --no-verbose -O /dev/null https://cdn.spring.io/spring-tools/$p2_path/plugins/$f
-          done
+#      - name: Verify Uploaded P2 Repo
+#        id: verify-p2-on-akamai
+#        run: |
+#          p2_path=`cat ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/s3-p2-repo-dist-path.txt`
+#          echo "Verifying uploaded to Akamai files..."
+#          cd ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/repository/plugins
+#          for f in `ls -p | grep -v '/$'`
+#          do
+#            wget --no-verbose -O /dev/null https://cdn.spring.io/spring-tools/$p2_path/plugins/$f
+#          done
       - name: Compute invalid URLs
         if: ${{ inputs.build_type != 'snapshot' }}
         id: compute-invalid-urls
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 962c45a93..c3293a812 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -123,14 +123,14 @@ jobs:
           aws s3 rm s3://tools-spring-io/$p2_path/ --recursive
           aws s3 cp ./repository/ s3://tools-spring-io/$p2_path/ --recursive --no-progress
       - name: Store TCP Dump
-        if: inputs.build_type == 'snapshot' && always()
-        id: tcp-dump
+        if: inputs.build_type == 'snapshot' && failure()
+        id: tcp-dump-upload
         run: |
           tcpdump_path=${{ github.workspace }}/eclipse-distribution/mycap.pcap
           p2_path=${{ steps.s3-paths.outputs.p2_path }}
           echo "P2 path: ${p2_path}"
           echo "TCP Dump path: ${tcpdump_path}"
-          aws s3 mv $tcpdump_path s3://tools-spring-io/$p2_path/mycap.pcap
+          aws s3 mv $tcpdump_path s3://tools-spring-io/$p2_path/mycap.pcap --no-progress
       - name: Upload Linux Distro Build Artifacts
         run: |
           cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products