Merge branch 'main' into main

opensearch-project · Sep 16, 2024 · f7a9164 · f7a9164
2 parents f1d43be + 58add11
commit f7a9164
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml
@@ -26,8 +26,9 @@ jobs:
           echo "Running backwards compatibility tests..."
           ./gradlew bwcTestSuite
       - name: Upload failed logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: logs
+          overwrite: 'true'
           path: build/testclusters/indexmanagementBwcCluster*/logs/*
diff --git a/.github/workflows/docker-security-test-workflow.yml b/.github/workflows/docker-security-test-workflow.yml
@@ -84,10 +84,11 @@ jobs:
             echo "Security plugin is NOT available skipping this run as tests without security have already been run"
           fi
       - name: Upload failed logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: logs
+          overwrite: 'true'
           path: build/testclusters/integTest-*/logs/*
       - name: Collect docker logs on failure
         uses: jwalton/gh-docker-logs@v2
@@ -96,8 +97,9 @@ jobs:
       - name: Tar logs
         run: tar cvzf ./logs.tgz ./logs
       - name: Upload logs to GitHub
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: logs.tgz
+          overwrite: 'true'
           path: ./logs.tgz
diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml
@@ -53,8 +53,9 @@ jobs:
           chown -R 1000:1000 `pwd`
           su `id -un 1000` -c "./gradlew integTest -PnumNodes=3 ${{ env.TEST_FILTER }}"
       - name: Upload failed logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: logs
+          overwrite: 'true'
           path: build/testclusters/integTest-*/logs/*
diff --git a/.github/workflows/security-test-workflow.yml b/.github/workflows/security-test-workflow.yml
@@ -42,8 +42,9 @@ jobs:
           chown -R 1000:1000 `pwd`
           su `id -un 1000` -c "./gradlew integTest -Dsecurity=true -Dhttps=true --tests '*IT'"
       - name: Upload failed logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: logs
+          overwrite: 'true'
           path: build/testclusters/integTest-*/logs/*
diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml
@@ -56,10 +56,10 @@ jobs:
           chown -R 1000:1000 `pwd`
           su `id -un 1000` -c "./gradlew build ${{ env.TEST_FILTER }}"
       - name: Upload failed logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
-          name: logs
+          name: logs-${{ matrix.java }}-${{ matrix.feature }}
           path: build/testclusters/integTest-*/logs/*
       - name: Create Artifact Path
         run: |
@@ -71,10 +71,12 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
       # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v1
+        # v4 requires node.js 20 which is not supported
+        uses: actions/upload-artifact@v3
         with:
-          name: index-management-plugin-ubuntu-latest
+          name: index-management-plugin-ubuntu-latest-${{ matrix.java }}
           path: index-management-artifacts
+          overwrite: 'true'
 
   test-and-build-windows-macos:
     env:
@@ -127,7 +129,8 @@ jobs:
           cp ./build/distributions/*.zip index-management-artifacts
       # This step uses the upload-artifact Github action: https://github.com/actions/upload-artifact
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
-          name: index-management-plugin-${{ matrix.os }}
+          name: index-management-plugin-${{ matrix.os }}-${{ matrix.java }}
           path: index-management-artifacts
+          overwrite: 'true'