From a3c3d4e339a7faa3c3e50f5554705244bfaf7511 Mon Sep 17 00:00:00 2001 From: Patrick Robb Date: Wed, 16 Apr 2025 11:10:54 -0400 Subject: [PATCH 1/6] ocre-tests: make workflows run one at a time Force the tests.yml to wait on GHA build.yml to complete before triggering. Signed-off-by: Patrick Robb --- .github/workflows/tests.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d7edfac6..04862d92 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,11 +1,9 @@ name: Tests on: - push: - branches: - - main - pull_request: - branches: - - main + workflow_run: + workflows: ["Build"] + types: + - completed jobs: tests: runs-on: zephyr-xlarge-runner From fa2aeb05acb4749d8d98408bb12e3104590bd2f5 Mon Sep 17 00:00:00 2001 From: Patrick Robb Date: Thu, 17 Apr 2025 15:47:13 -0400 Subject: [PATCH 2/6] ocre-tests: set concurrency group for gha workflows Signed-off-by: Patrick Robb --- .github/workflows/build.yml | 2 ++ .github/workflows/tests.yml | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b499aa48..d4629007 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,8 @@ on: pull_request: branches: - main +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} jobs: build: runs-on: zephyr-xlarge-runner diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 04862d92..2ded8ea7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,9 +1,14 @@ name: Tests on: - workflow_run: - workflows: ["Build"] - types: - - completed + push: + branches: + - main + pull_request: + branches: + - main +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: tests: runs-on: zephyr-xlarge-runner From e0cb54e10ed2486c97285cfeb556133e927b2585 Mon Sep 17 00:00:00 2001 From: Patrick Robb Date: Fri, 18 Apr 2025 11:32:03 -0400 Subject: [PATCH 3/6] ocre-tests: handle test group failure gracefully Signed-off-by: Patrick Robb --- .github/workflows/build.yml | 2 -- .github/workflows/tests.yml | 15 +++++---------- tests/beginTests.sh | 6 ++++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4629007..b499aa48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,8 +6,6 @@ on: pull_request: branches: - main -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} jobs: build: runs-on: zephyr-xlarge-runner diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2ded8ea7..0853c718 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,14 +1,9 @@ name: Tests on: - push: - branches: - - main - pull_request: - branches: - - main -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + workflow_run: + workflows: [Build] + types: + - completed jobs: tests: runs-on: zephyr-xlarge-runner @@ -22,7 +17,7 @@ jobs: - name: Flash Validation Tests run: | - cd tests && bash beginTests.sh "flashValidation" + cd tests && bash beginTests.sh "flashValidation" - name: Print Flash Validation Logs if: always() diff --git a/tests/beginTests.sh b/tests/beginTests.sh index 945c9bc6..5f9cf1dc 100755 --- a/tests/beginTests.sh +++ b/tests/beginTests.sh @@ -110,4 +110,10 @@ done echo "Test suite is complete" >> $LOGFILE +if [ $TEST_GROUP_RESULT -eq 0 ]; then + echo "$NAME test group passed" +else + echo "$NAME test group failed" +fi + exit $TEST_GROUP_RESULT \ No newline at end of file From dd7d56aba0c68ea913c24124bbd98f740222db64 Mon Sep 17 00:00:00 2001 From: Patrick Robb Date: Wed, 23 Apr 2025 14:31:41 -0400 Subject: [PATCH 4/6] asdfasf --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0853c718..1edd8cd9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,7 +1,7 @@ name: Tests on: workflow_run: - workflows: [Build] + workflows: ["Build"] types: - completed jobs: From 4a91920b1f3fdb83175b9b6a2266701803bbdab3 Mon Sep 17 00:00:00 2001 From: Patrick Robb Date: Wed, 23 Apr 2025 14:36:14 -0400 Subject: [PATCH 5/6] asdfasdf --- .github/workflows/tests.yml | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1edd8cd9..e2a4fec3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,27 +5,27 @@ on: types: - completed jobs: - tests: - runs-on: zephyr-xlarge-runner + tests: + runs-on: zephyr-xlarge-runner - steps: - - name: Make the github actions runner recursively take ownership of the github workspace - run: sudo chown -R $(whoami) ${{ github.workspace }} + steps: + - name: Make the github actions runner recursively take ownership of the github workspace + run: sudo chown -R $(whoami) ${{ github.workspace }} - - name: Checkout - uses: actions/checkout@v4 - - - name: Flash Validation Tests - run: | - cd tests && bash beginTests.sh "flashValidation" + - name: Checkout + uses: actions/checkout@v4 + + - name: Flash Validation Tests + run: | + cd tests && bash beginTests.sh "flashValidation" - - name: Print Flash Validation Logs - if: always() - run: cat /tmp/flashValidation.log - - - name: Upload log file as artifact - if: always() - uses: actions/upload-artifact@v4 - with: - name: "FlashValidation.log" - path: /tmp/flashValidation.log + - name: Print Flash Validation Logs + if: always() + run: cat /tmp/flashValidation.log + + - name: Upload log file as artifact + if: always() + uses: actions/upload-artifact@v4 + with: + name: "FlashValidation.log" + path: /tmp/flashValidation.log From 17900cf3293b372808099cac44ada226a9273bbb Mon Sep 17 00:00:00 2001 From: Patrick Robb Date: Wed, 23 Apr 2025 15:14:59 -0400 Subject: [PATCH 6/6] test --- tests/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/README.md b/tests/README.md index 9c9f6da8..28a42dc9 100644 --- a/tests/README.md +++ b/tests/README.md @@ -58,3 +58,5 @@ that it exits with 0 on success and 1 on failure. ``` Execution commands are run with `bash -c "execution command"`. + +placeholder \ No newline at end of file