chore: publish coverage from internal port tests, provide comment whe…

…re resu… (#2195) * publish coverage from internal port tests, provide comment where results are not stored, remove integration test count publish Signed-off-by: achmelo <[email protected]> * merge Signed-off-by: achmelo <[email protected]> * correct job name Signed-off-by: achmelo <[email protected]>
zowe · Mar 15, 2022 · d471bed · d471bed
1 parent f88a90b
commit d471bed
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -63,7 +63,6 @@ jobs:
                     -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
             -   uses: ./.github/actions/dump-jacoco
                 if: always()
-
             -   name: Store results
                 uses: actions/upload-artifact@v3
                 if: always()
@@ -72,7 +71,6 @@ jobs:
                     path: |
                         integration-tests/build/reports/**
                         results/**
-                        integration-tests/build/test-results/**
 
             -   uses: ./.github/actions/teardown
 
@@ -111,7 +109,7 @@ jobs:
                 run: >
                     ./gradlew :integration-tests:runRegistrationTests --info -Denvironment.config=-docker -Denvironment.offPlatform=true
                     -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
-
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -211,6 +209,7 @@ jobs:
                 run: >
                     ./gradlew :integration-tests:runZosmfAuthTest --info -Denvironment.config=-docker -Denvironment.offPlatform=true
                     -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -258,6 +257,7 @@ jobs:
                 run: >
                     ./gradlew :integration-tests:runZosmfAuthTest --info -Denvironment.config=-docker -Denvironment.offPlatform=true
                     -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -306,6 +306,7 @@ jobs:
                 run: >
                     ./gradlew :integration-tests:runZosmfAuthTest --info -Denvironment.config=-docker -Denvironment.offPlatform=true
                     -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -353,13 +354,18 @@ jobs:
                 run: >
                     ./gradlew :integration-tests:runBaseTestsInternalPort --info -Denvironment.config=-docker -Denvironment.offPlatform=true
                     -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
+
+            -   uses: ./.github/actions/dump-jacoco
+                if: always()
+
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
                 with:
                     name: ContainerCITestsInternalPort
                     path: |
                         integration-tests/build/reports/**
+                        results/**
 
             -   uses: ./.github/actions/teardown
 
@@ -482,7 +488,7 @@ jobs:
                 run: >
                     ./gradlew :integration-tests:runCachingServiceTests --info -Denvironment.config=-docker -Denvironment.offPlatform=true
                     -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
-
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -561,7 +567,7 @@ jobs:
             -   name: Correct Permisions
                 run: |
                     chmod 755 -R .gradle
-
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -655,7 +661,8 @@ jobs:
                     docker ps -q | xargs -L 1 docker logs
             -   name: Correct Permisions
                 run: |
-                    chmod 755 -R .gradle                    
+                    chmod 755 -R .gradle
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -725,7 +732,7 @@ jobs:
             -   name: Correct Permisions
                 run: |
                     chmod 755 -R .gradle
-                    
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -795,7 +802,7 @@ jobs:
             -   name: Correct Permisions
                 run: |
                     chmod 755 -R .gradle
-                    
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -869,7 +876,7 @@ jobs:
             -   name: Correct Permisions
                 run: |
                     chmod 755 -R .gradle
-                    
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -943,7 +950,7 @@ jobs:
             -   name: Correct Permisions
                 run: |
                     chmod 755 -R .gradle
-                    
+            # Coverage results are not stored in this job as it would not provide much additional data
             -   name: Store results
                 uses: actions/upload-artifact@v2
                 if: always()
@@ -1029,7 +1036,7 @@ jobs:
             -   uses: ./.github/actions/teardown
 
     PublishResults:
-        needs: [CITests,CITestsWithInfinispan,CITestsZosmfRsu2012,CITestsWithRedis]
+        needs: [CITests,CITestsWithInfinispan,CITestsZosmfRsu2012,CITestsWithRedis,CITestsInternalPort]
         runs-on: ubuntu-latest
         timeout-minutes: 15
 
@@ -1058,13 +1065,13 @@ jobs:
                 with:
                     name: ContainerCITestsWithRedis
                     path: containercitestswithredis
-            -   name: Copy test reports
-                run: |
-                    mkdir -p integration-tests/build/test-results
-                    cp -R containercitests/integration-tests/build/test-results/runContainerTests integration-tests/build/test-results
+            -   uses: actions/download-artifact@v3
+                with:
+                    name: ContainerCITestsInternalPort
+                    path: containercitestsinternalport
             -   name: Code coverage and publish results
                 run: >
-                    ./gradlew --info coverage sonarqube -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,containercitestswithredis/results"
+                    ./gradlew --info coverage sonarqube -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,containercitestswithredis/results,containercitestsinternalport/results"
                     -Psonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_TOKEN
                     -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD
                 env: