From 51f5d92eb4453a758003461ca647839f5536d92b Mon Sep 17 00:00:00 2001 From: Mark Mercado Date: Wed, 5 Oct 2022 07:54:37 -0400 Subject: [PATCH 1/8] Honor docker-compose exit codes --- .github/workflows/st2-docker.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/st2-docker.yml b/.github/workflows/st2-docker.yml index 1c47c511..aa13c3db 100644 --- a/.github/workflows/st2-docker.yml +++ b/.github/workflows/st2-docker.yml @@ -21,6 +21,7 @@ jobs: docker-compose-up: runs-on: ubuntu-latest + needs: [docker-compose-lint] steps: - uses: actions/checkout@v3 @@ -32,10 +33,24 @@ jobs: run: | docker-compose up --detach - - name: Run st2 smoke-tests + - name: Sleep run: | sleep 60 - docker-compose -f tests/st2tests.yaml up + + - name: Run st2 smoke-tests + run: | + docker-compose --file tests/st2tests.yaml up --no-color 2>&1 \ + | tee /tmp/compose.log + + rc="$(grep -q 'tests_st2test-tools_1 exited with code 0' /tmp/compose.log 2>/dev/null; echo $?)" + if [[ $rc -ne 0 ]]; then + exit 1 + fi + + rc="$(grep -q 'tests_st2test_1 exited with code 0' /tmp/compose.log 2>/dev/null; echo $?)" + if [[ $rc -ne 0 ]]; then + exit 1 + fi - name: Troubleshooting the build failure if: ${{ failure() }} @@ -43,3 +58,4 @@ jobs: docker-compose ps # Display logs to help troubleshoot build failures, etc docker-compose logs --tail="500" st2api + exit 1 From e47fca443a12c26228e1618136c0191b182406c6 Mon Sep 17 00:00:00 2001 From: Mark Mercado Date: Thu, 6 Oct 2022 08:03:57 -0400 Subject: [PATCH 2/8] Try `docker-compose run` --- .github/workflows/st2-docker.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/st2-docker.yml b/.github/workflows/st2-docker.yml index aa13c3db..8990ec77 100644 --- a/.github/workflows/st2-docker.yml +++ b/.github/workflows/st2-docker.yml @@ -37,20 +37,25 @@ jobs: run: | sleep 60 + # - name: Run st2 smoke-tests + # run: | + # docker-compose --file tests/st2tests.yaml up --no-color 2>&1 \ + # | tee /tmp/compose.log + + # rc="$(grep -q 'tests_st2test-tools_1 exited with code 0' /tmp/compose.log 2>/dev/null; echo $?)" + # if [[ $rc -ne 0 ]]; then + # exit 1 + # fi + + # rc="$(grep -q 'tests_st2test_1 exited with code 0' /tmp/compose.log 2>/dev/null; echo $?)" + # if [[ $rc -ne 0 ]]; then + # exit 1 + # fi + - name: Run st2 smoke-tests + working-directory: tests run: | - docker-compose --file tests/st2tests.yaml up --no-color 2>&1 \ - | tee /tmp/compose.log - - rc="$(grep -q 'tests_st2test-tools_1 exited with code 0' /tmp/compose.log 2>/dev/null; echo $?)" - if [[ $rc -ne 0 ]]; then - exit 1 - fi - - rc="$(grep -q 'tests_st2test_1 exited with code 0' /tmp/compose.log 2>/dev/null; echo $?)" - if [[ $rc -ne 0 ]]; then - exit 1 - fi + docker-compose --file tests/st2tests.yaml run st2test-tools - name: Troubleshooting the build failure if: ${{ failure() }} From 28ea9135ca09f87bb8ccff601709e57bf465261a Mon Sep 17 00:00:00 2001 From: Mark Mercado Date: Thu, 6 Oct 2022 08:05:08 -0400 Subject: [PATCH 3/8] Add this branch --- .github/workflows/st2-docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/st2-docker.yml b/.github/workflows/st2-docker.yml index 8990ec77..3af5d7de 100644 --- a/.github/workflows/st2-docker.yml +++ b/.github/workflows/st2-docker.yml @@ -6,6 +6,7 @@ on: branches: - main - master + - issue-251 schedule: - cron: 0 1 * * * workflow_dispatch: From 7b3d57794055d9d75e45048d3b3c8134171441b7 Mon Sep 17 00:00:00 2001 From: Mark Mercado Date: Thu, 6 Oct 2022 08:08:00 -0400 Subject: [PATCH 4/8] Whoops --- .github/workflows/st2-docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/st2-docker.yml b/.github/workflows/st2-docker.yml index 3af5d7de..369d4d50 100644 --- a/.github/workflows/st2-docker.yml +++ b/.github/workflows/st2-docker.yml @@ -54,7 +54,6 @@ jobs: # fi - name: Run st2 smoke-tests - working-directory: tests run: | docker-compose --file tests/st2tests.yaml run st2test-tools From 0ae8918f45144821aec5b89213a2cce10c4a691b Mon Sep 17 00:00:00 2001 From: Mark Mercado Date: Thu, 6 Oct 2022 08:18:17 -0400 Subject: [PATCH 5/8] Switch service --- .github/workflows/st2-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/st2-docker.yml b/.github/workflows/st2-docker.yml index 369d4d50..06ecc855 100644 --- a/.github/workflows/st2-docker.yml +++ b/.github/workflows/st2-docker.yml @@ -55,7 +55,7 @@ jobs: - name: Run st2 smoke-tests run: | - docker-compose --file tests/st2tests.yaml run st2test-tools + docker-compose --file tests/st2tests.yaml run st2test - name: Troubleshooting the build failure if: ${{ failure() }} From 952e8082188bc087a4f191534064c121d80a4546 Mon Sep 17 00:00:00 2001 From: Mark Mercado Date: Thu, 6 Oct 2022 08:28:12 -0400 Subject: [PATCH 6/8] Remove dead code and dev branch --- .github/workflows/st2-docker.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/st2-docker.yml b/.github/workflows/st2-docker.yml index 06ecc855..e1dbee5c 100644 --- a/.github/workflows/st2-docker.yml +++ b/.github/workflows/st2-docker.yml @@ -6,7 +6,6 @@ on: branches: - main - master - - issue-251 schedule: - cron: 0 1 * * * workflow_dispatch: @@ -38,21 +37,6 @@ jobs: run: | sleep 60 - # - name: Run st2 smoke-tests - # run: | - # docker-compose --file tests/st2tests.yaml up --no-color 2>&1 \ - # | tee /tmp/compose.log - - # rc="$(grep -q 'tests_st2test-tools_1 exited with code 0' /tmp/compose.log 2>/dev/null; echo $?)" - # if [[ $rc -ne 0 ]]; then - # exit 1 - # fi - - # rc="$(grep -q 'tests_st2test_1 exited with code 0' /tmp/compose.log 2>/dev/null; echo $?)" - # if [[ $rc -ne 0 ]]; then - # exit 1 - # fi - - name: Run st2 smoke-tests run: | docker-compose --file tests/st2tests.yaml run st2test From 75c35707e389c8ea5868268bd9278c1b31d4347b Mon Sep 17 00:00:00 2001 From: Mark Mercado Date: Thu, 6 Oct 2022 09:35:26 -0400 Subject: [PATCH 7/8] Bump Python to 3.8.10 --- tests/st2tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/st2tests.sh b/tests/st2tests.sh index c2638df4..2c5a6390 100755 --- a/tests/st2tests.sh +++ b/tests/st2tests.sh @@ -9,7 +9,7 @@ load "${BATS_HELPERS_DIR}/bats-file/load.bash" assert_success # st2 3.3dev (9ea417346), on Python 3.6.9 assert_line --partial "st2 ${ST2_VERSION}" - assert_line --partial 'on Python 3.6.9' + assert_line --partial 'on Python 3.8.10' } @test 'ST2_AUTH_URL service endpoint is accessible and working' { From 98b818fcd4978f8451fd4d653b7dfab0b8c3a598 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 6 Oct 2022 14:54:37 +0100 Subject: [PATCH 8/8] Update tests/st2tests.sh with the correct python version in the comments --- tests/st2tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/st2tests.sh b/tests/st2tests.sh index 2c5a6390..36386eb3 100755 --- a/tests/st2tests.sh +++ b/tests/st2tests.sh @@ -7,7 +7,7 @@ load "${BATS_HELPERS_DIR}/bats-file/load.bash" @test 'st2 version deployed and python env are as expected' { run st2 --version assert_success - # st2 3.3dev (9ea417346), on Python 3.6.9 + # st2 3.7.0, on Python 3.8.10 assert_line --partial "st2 ${ST2_VERSION}" assert_line --partial 'on Python 3.8.10' }