Test: retry build on fail (rework) (#5822)

reworking retry logic for build failures ### QA Notes All tests should pass. Failed builds should retry
posit-dev · Dec 18, 2024 · 381d39b · 381d39b
1 parent 1f8a3f7
commit 381d39b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/test-e2e-linux.yml b/.github/workflows/test-e2e-linux.yml
@@ -86,20 +86,22 @@ jobs:
         uses: ./.github/actions/cache-multi-paths
 
       - name: Attempt 1 - Setup Build and Compile
+        id: attempt1
         uses: ./.github/actions/setup-build-env
         continue-on-error: true
 
       - name: Attempt 2 - Setup Build and Compile
-        if: ${{ failure() }}
+        if: ${{ steps.attempt1.outcome == 'failure' }}
+        id: attempt2
         uses: ./.github/actions/setup-build-env
         continue-on-error: true
 
       - name: Attempt 3 - Setup Build and Compile
-        if: ${{ failure() }}
+        if: ${{ steps.attempt2.outcome == 'failure' }}
         uses: ./.github/actions/setup-build-env
 
       - name: Fail if Retries Exhausted
-        if: ${{ failure() }}
+        if: ${{ steps.attempt3.outcome == 'failure' }}
         run: exit 1
 
       - name: Install Positron License

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -30,20 +30,22 @@ jobs:
         uses: ./.github/actions/cache-multi-paths
 
       - name: Attempt 1 - Setup Build and Compile
+        id: attempt1
         uses: ./.github/actions/setup-build-env
         continue-on-error: true
 
       - name: Attempt 2 - Setup Build and Compile
-        if: ${{ failure() }}
+        if: ${{ steps.attempt1.outcome == 'failure' }}
+        id: attempt2
         uses: ./.github/actions/setup-build-env
         continue-on-error: true
 
       - name: Attempt 3 - Setup Build and Compile
-        if: ${{ failure() }}
+        if: ${{ steps.attempt2.outcome == 'failure' }}
         uses: ./.github/actions/setup-build-env
 
       - name: Fail if Retries Exhausted
-        if: ${{ failure() }}
+        if: ${{ steps.attempt3.outcome == 'failure' }}
         run: exit 1
 
       - name: Install Positron License

diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -30,20 +30,22 @@ jobs:
         uses: ./.github/actions/cache-multi-paths
 
       - name: Attempt 1 - Setup Build and Compile
+        id: attempt1
         uses: ./.github/actions/setup-build-env
         continue-on-error: true
 
       - name: Attempt 2 - Setup Build and Compile
-        if: ${{ failure() }}
+        if: ${{ steps.attempt1.outcome == 'failure' }}
+        id: attempt2
         uses: ./.github/actions/setup-build-env
         continue-on-error: true
 
       - name: Attempt 3 - Setup Build and Compile
-        if: ${{ failure() }}
+        if: ${{ steps.attempt2.outcome == 'failure' }}
         uses: ./.github/actions/setup-build-env
 
       - name: Fail if Retries Exhausted
-        if: ${{ failure() }}
+        if: ${{ steps.attempt3.outcome == 'failure' }}
         run: exit 1
 
       - name: Install Positron License

diff --git a/test/automation/src/positron/positronDataExplorer.ts b/test/automation/src/positron/positronDataExplorer.ts
@@ -58,7 +58,7 @@ export class PositronDataExplorer {
 	 */
 	async getDataExplorerTableData(): Promise<object[]> {
 
-		await this.code.driver.page.locator(IDLE_STATUS).waitFor({ state: 'visible', timeout: 60000 });
+		await expect(this.code.driver.page.locator(IDLE_STATUS)).toBeVisible({ timeout: 60000 });
 
 		// need a brief additional wait
 		await this.code.wait(1000);