NH-37575: use name attribute for artifact upload and update long-runn…

…ing benchmark container registry path.
solarwinds · Jun 27, 2024 · bd4ef00 · bd4ef00
1 parent 3253ce1
commit bd4ef00
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 141 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -185,9 +185,9 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         if: always()
-        name: lambda-release-test
         with:
           path: smoke-tests/build/reports/tests/test
+          name: lambda-release-test
 
       - name: Docker logout
         run: docker logout
@@ -291,9 +291,9 @@ jobs:
           done
 
       - uses: actions/upload-artifact@v4
-        name: arns
         with:
           path: arns.txt
+          name: arns
 
   smoke-test-linux:
     runs-on: ubuntu-latest
@@ -321,7 +321,6 @@ jobs:
       - s3-stage-upload
     steps:
       - uses: actions/checkout@v4
-
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -335,3 +334,50 @@ jobs:
           .\gradlew.bat :netty-test:run
         env:
           SW_APM_SERVICE_KEY: ${{ secrets.SW_APM_SERVICE_KEY }}:smoke-test-windows
+
+  release-test:
+    runs-on: ubuntu-latest
+    env:
+      LAMBDA: "false"
+    needs:
+      - s3-stage-upload
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Docker login
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_USERNAME --password-stdin
+
+      - name: Build smoke-test
+        run: |
+          cd smoke-tests
+          ./gradlew build -x test
+
+      - name: Build webmvc jar
+        run: |
+          cd smoke-tests
+          ./gradlew :spring-boot-webmvc:build
+
+      - name: Build webmvc image
+        run: |
+          cd smoke-tests/spring-boot-webmvc
+          docker image build --tag smt:webmvc .
+
+      - name: Execute smoke tests
+        run: |
+          cd smoke-tests
+          ./gradlew test
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          path: smoke-tests/build/reports/tests/test
+          name: release-test
+
+      - name: Docker logout
+        run: docker logout
diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -258,9 +258,9 @@ jobs:
           done
 
       - uses: actions/upload-artifact@v4
-        name: arns
         with:
           path: arns.txt
+          name: arns
 
   benchmark:
     runs-on: ubuntu-latest
@@ -282,14 +282,14 @@ jobs:
           ./gradlew test
 
       - uses: actions/upload-artifact@v4
-        name: benchmark-summary
         with:
           path: benchmark/results/release/summary.txt
+          name: benchmark-summary
 
       - uses: actions/upload-artifact@v4
-        name: benchmark-test
         with:
           path: benchmark/build/reports/tests/test/
+          name: benchmark-test
 
       - name: Docker logout
         run: docker logout