Merge pull request rundeck#443 from rundeck/gschueler-patch-2

upload integration test reports
jyanko · May 20, 2022 · 70fc3d7 · 70fc3d7
2 parents 631d6a0 + fc333b3
commit 70fc3d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -45,6 +45,11 @@ jobs:
       run: chmod +x gradlew
     - name: Integration Test
       run: ./gradlew integrationTest --dependency-verification off
+    - uses: actions/upload-artifact@v3
+      if: failure()
+      with:
+        name: integration-test-report
+        path: integration-tests/build/reports/tests/integrationTest
   build:
 
     runs-on: ubuntu-latest
@@ -67,6 +72,11 @@ jobs:
       run: ./gradlew build --dependency-verification off
     - name: Integration tests
       run: ./gradlew integrationTest --dependency-verification off
+    - uses: actions/upload-artifact@v3
+      if: failure()
+      with:
+        name: integration-test-report
+        path: integration-tests/build/reports/tests/integrationTest
     - name: deb/rpm install test
       run: bash scripts/install-test.sh
     - name: rpm upgrade test

diff --git a/integration-tests/src/test/groovy/testing/tests/BasicIntegrationSpec.groovy b/integration-tests/src/test/groovy/testing/tests/BasicIntegrationSpec.groovy
@@ -18,6 +18,7 @@ import spock.lang.Specification
 
 import java.nio.file.Files
 import java.nio.file.Path
+import java.time.Duration
 
 @Testcontainers
 class BasicIntegrationSpec extends Specification {
@@ -30,14 +31,14 @@ class BasicIntegrationSpec extends Specification {
                     Transferable.of('admin=letmeinplease,admin'),
                     '/var/lib/rundeck/etc/tokens.properties',
             )
-            .waitingFor(Wait.forHttp("/api/41/system/info").forStatusCode(403))
+            .waitingFor(Wait.forHttp("/api/41/system/info").forStatusCode(403).withStartupTimeout(Duration.ofMinutes(5)))
 //            .waitingFor(
 //                    Wait.forLogMessage(".*rundeckapp.Application - Started Application.*\\n", 1)
 //            )
             .withExposedPorts(4440)
 
     @Shared
-    Client<RundeckApi> client;
+    Client<RundeckApi> client
 
     static String PROJ_NAME = 'test'
     static String JOBFILE1 = 'jobs/test_job.xml'