From d16f96e29b5e40e22b5746fa3e2f4ce5007897f0 Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Wed, 11 Dec 2024 11:39:25 +0530 Subject: [PATCH 01/13] bump upload-arifact to v4 Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 3a3929d1..51fdba98 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -40,7 +40,7 @@ jobs: yq e -i '.services.istio.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml cat ./.github/install/deploy.yaml - name: Uploading file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: patternfile path: ./.github/install/deploy.yaml @@ -155,7 +155,7 @@ jobs: yq e -i '.services.prometheus.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml cat ./.github/install/deploywithaddons.yaml - name: Uploading file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: patternfile path: ./.github/install/deploywithaddons.yaml @@ -270,7 +270,7 @@ jobs: yq e -i '.services.istioinstallation.settings.istioVersion="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithsampleapp.yaml cat ./.github/install/deploywithsampleapp.yaml - name: Uploading file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: patternfile path: ./.github/install/deploywithsampleapp.yaml From 1b57426ddd5f498fc823a2687525d208447df1c7 Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Wed, 11 Dec 2024 12:41:26 +0530 Subject: [PATCH 02/13] append unique identifier run_id to artifact name to avoid duplication (according to v4) Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 51fdba98..6989fbf5 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -42,7 +42,7 @@ jobs: - name: Uploading file uses: actions/upload-artifact@v4 with: - name: patternfile + name: patternfile-${{ github.run_id }} path: ./.github/install/deploy.yaml TestIstioForServicemeshInstall: @@ -157,7 +157,7 @@ jobs: - name: Uploading file uses: actions/upload-artifact@v4 with: - name: patternfile + name: patternfile-${{ github.run_id }} path: ./.github/install/deploywithaddons.yaml TestIstioForServicemeshAndAddon: @@ -272,7 +272,7 @@ jobs: - name: Uploading file uses: actions/upload-artifact@v4 with: - name: patternfile + name: patternfile-${{ github.run_id }} path: ./.github/install/deploywithsampleapp.yaml TestIstioForServicemeshAndSampleApp: From cd80130e9e473650b62ec2641b6d7bef6424f183 Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Wed, 11 Dec 2024 12:55:08 +0530 Subject: [PATCH 03/13] change artifact name to be more self descriptive Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 6989fbf5..8ebf0626 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -42,7 +42,7 @@ jobs: - name: Uploading file uses: actions/upload-artifact@v4 with: - name: patternfile-${{ github.run_id }} + name: patternfile-servicemesh-install path: ./.github/install/deploy.yaml TestIstioForServicemeshInstall: @@ -157,7 +157,7 @@ jobs: - name: Uploading file uses: actions/upload-artifact@v4 with: - name: patternfile-${{ github.run_id }} + name: patternfile-servicemesh-addon path: ./.github/install/deploywithaddons.yaml TestIstioForServicemeshAndAddon: @@ -272,7 +272,7 @@ jobs: - name: Uploading file uses: actions/upload-artifact@v4 with: - name: patternfile-${{ github.run_id }} + name: patternfile-servicemesh-sample-app path: ./.github/install/deploywithsampleapp.yaml TestIstioForServicemeshAndSampleApp: From 23c70e9c1bc7ae845b1d5796489ac971c7642782 Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Wed, 11 Dec 2024 13:21:34 +0530 Subject: [PATCH 04/13] bump download-artifact version to v4 Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 8ebf0626..7723ea77 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -83,9 +83,9 @@ jobs: repository: meshery/meshery token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: data.json + name: data-servicemesh-install.json - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -198,9 +198,9 @@ jobs: repository: meshery/meshery token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: data.json + name: data-servicemesh-addon.json - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -313,9 +313,9 @@ jobs: repository: meshery/meshery token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: data.json + name: data-servicemesh-sample-app.json - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results From c14fb0585eddad55a4e31b3951cee23317729f89 Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Wed, 11 Dec 2024 13:59:48 +0530 Subject: [PATCH 05/13] change file name to data.json Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 7723ea77..a08c1151 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -85,7 +85,7 @@ jobs: - name: DownloadJSON uses: actions/download-artifact@v4 with: - name: data-servicemesh-install.json + name: data.json - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -200,7 +200,7 @@ jobs: - name: DownloadJSON uses: actions/download-artifact@v4 with: - name: data-servicemesh-addon.json + name: data.json - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -315,7 +315,7 @@ jobs: - name: DownloadJSON uses: actions/download-artifact@v4 with: - name: data-servicemesh-sample-app.json + name: data.json - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results From a2bb5ec244899c67f094c13794ece73f3c853388 Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Sat, 14 Dec 2024 12:18:14 +0530 Subject: [PATCH 06/13] add same patternfile name for upload and download artifacts Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index a08c1151..c82106a6 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -85,7 +85,7 @@ jobs: - name: DownloadJSON uses: actions/download-artifact@v4 with: - name: data.json + name: patternfile-servicemesh-install - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -200,7 +200,7 @@ jobs: - name: DownloadJSON uses: actions/download-artifact@v4 with: - name: data.json + name: patternfile-servicemesh-addon - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -315,7 +315,7 @@ jobs: - name: DownloadJSON uses: actions/download-artifact@v4 with: - name: data.json + name: patternfile-servicemesh-sample-app - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results From 3d6bb3d6385ea57f508249019804758383c1ff3a Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Sat, 14 Dec 2024 12:41:37 +0530 Subject: [PATCH 07/13] fix unexpected symbol issue --- .github/workflows/e2etests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index c82106a6..5b7ccb2b 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -66,7 +66,7 @@ jobs: UpdateDocsForServicemeshInstall: needs: TestIstioForServicemeshInstall - if: "always() && github.event_name != 'pull_request' " + if: always() && github.event_name != 'pull_request' runs-on: ubuntu-22.04 steps: - name: Skip if needed @@ -181,7 +181,7 @@ jobs: UpdateDocsForServicemeshAndAddon: needs: TestIstioForServicemeshAndAddon - if: "always() && github.event_name != 'pull_request' " + if: always() && github.event_name != 'pull_request' runs-on: ubuntu-22.04 steps: - name: Skip if needed @@ -296,7 +296,7 @@ jobs: UpdateDocsForServicemeshAndSampleApp: needs: TestIstioForServicemeshAndSampleApp - if: "always() && github.event_name != 'pull_request' " + if: always() && github.event_name != 'pull_request' runs-on: ubuntu-22.04 steps: - name: Skip if needed From c8dc70aab04c1d073ace6cd991bb4ef68371e514 Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Sat, 14 Dec 2024 12:47:44 +0530 Subject: [PATCH 08/13] add same path for corresponding upload artifact Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 5b7ccb2b..cbaaaaca 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -86,6 +86,7 @@ jobs: uses: actions/download-artifact@v4 with: name: patternfile-servicemesh-install + path: ./.github/install/deploy.yaml - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -201,6 +202,7 @@ jobs: uses: actions/download-artifact@v4 with: name: patternfile-servicemesh-addon + path: ./.github/install/deploywithaddons.yaml - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -316,6 +318,7 @@ jobs: uses: actions/download-artifact@v4 with: name: patternfile-servicemesh-sample-app + path: ./.github/install/deploywithsampleapp.yaml - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results From c5d113f9db393e61df3c27b5564555b3676de8cc Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Sat, 14 Dec 2024 13:03:23 +0530 Subject: [PATCH 09/13] Revert "fix unexpected symbol issue" This reverts commit 3d6bb3d6385ea57f508249019804758383c1ff3a. Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index cbaaaaca..057aa980 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -66,7 +66,7 @@ jobs: UpdateDocsForServicemeshInstall: needs: TestIstioForServicemeshInstall - if: always() && github.event_name != 'pull_request' + if: "always() && github.event_name != 'pull_request' " runs-on: ubuntu-22.04 steps: - name: Skip if needed @@ -182,7 +182,7 @@ jobs: UpdateDocsForServicemeshAndAddon: needs: TestIstioForServicemeshAndAddon - if: always() && github.event_name != 'pull_request' + if: "always() && github.event_name != 'pull_request' " runs-on: ubuntu-22.04 steps: - name: Skip if needed @@ -298,7 +298,7 @@ jobs: UpdateDocsForServicemeshAndSampleApp: needs: TestIstioForServicemeshAndSampleApp - if: always() && github.event_name != 'pull_request' + if: "always() && github.event_name != 'pull_request' " runs-on: ubuntu-22.04 steps: - name: Skip if needed From 906a41ac8a5ae3fb6807b71b14831f7d800dda1b Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Sat, 14 Dec 2024 13:34:26 +0530 Subject: [PATCH 10/13] remove path Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 057aa980..c82106a6 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -86,7 +86,6 @@ jobs: uses: actions/download-artifact@v4 with: name: patternfile-servicemesh-install - path: ./.github/install/deploy.yaml - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -202,7 +201,6 @@ jobs: uses: actions/download-artifact@v4 with: name: patternfile-servicemesh-addon - path: ./.github/install/deploywithaddons.yaml - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results @@ -318,7 +316,6 @@ jobs: uses: actions/download-artifact@v4 with: name: patternfile-servicemesh-sample-app - path: ./.github/install/deploywithsampleapp.yaml - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results From f911ece00a624b394b299dc4709be4b3a952c4fc Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Sat, 14 Dec 2024 13:40:23 +0530 Subject: [PATCH 11/13] test: checking if this works Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index c82106a6..10fb307f 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -42,7 +42,7 @@ jobs: - name: Uploading file uses: actions/upload-artifact@v4 with: - name: patternfile-servicemesh-install + name: patternfile path: ./.github/install/deploy.yaml TestIstioForServicemeshInstall: @@ -85,7 +85,7 @@ jobs: - name: DownloadJSON uses: actions/download-artifact@v4 with: - name: patternfile-servicemesh-install + name: pattern - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results From 1438b19a6ecc93c2c48c541b1ded8288f47a936e Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Sat, 14 Dec 2024 13:53:43 +0530 Subject: [PATCH 12/13] test: checking if this works Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 10fb307f..24a93483 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -85,7 +85,7 @@ jobs: - name: DownloadJSON uses: actions/download-artifact@v4 with: - name: pattern + name: patternfile - name: Add commit SHORT_SHA run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV - name: echo results From eb897844354771c5c5a4dfd38c9680e9c11e8de9 Mon Sep 17 00:00:00 2001 From: TusharMohapatra07 Date: Mon, 23 Dec 2024 18:00:13 +0530 Subject: [PATCH 13/13] test commit Signed-off-by: TusharMohapatra07 --- .github/workflows/e2etests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 24a93483..0b69de20 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -296,7 +296,7 @@ jobs: UpdateDocsForServicemeshAndSampleApp: needs: TestIstioForServicemeshAndSampleApp - if: "always() && github.event_name != 'pull_request' " + if: "always() && github.event_name != 'pull_request'" runs-on: ubuntu-22.04 steps: - name: Skip if needed