From f836f7f8497c8625b96f0634fce6bb687b04ec82 Mon Sep 17 00:00:00 2001 From: teor Date: Sat, 4 Nov 2023 00:41:10 +1000 Subject: [PATCH] fix(ci): In config tests, look for the config being successfully loaded by Zebra (#7900) * Look for zebrad config load, not just the file name in any log * Look for it in the docker unit tests as well --- .github/workflows/cd-deploy-nodes-gcp.yml | 2 +- .github/workflows/ci-unit-tests-docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml index bf6b9cb58..3c41c296d 100644 --- a/.github/workflows/cd-deploy-nodes-gcp.yml +++ b/.github/workflows/cd-deploy-nodes-gcp.yml @@ -148,7 +148,7 @@ jobs: with: test_id: 'custom-conf' docker_image: ${{ vars.GAR_BASE }}/zebrad@${{ needs.build.outputs.image_digest }} - grep_patterns: '-e "v1.0.0-rc.2.toml"' + grep_patterns: '-e "loaded zebrad config.*config_path.*=.*v1.0.0-rc.2.toml"' test_variables: '-e NETWORK -e ZEBRA_CONF_PATH="zebrad/tests/common/configs/v1.0.0-rc.2.toml"' network: ${{ inputs.network || vars.ZCASH_NETWORK }} diff --git a/.github/workflows/ci-unit-tests-docker.yml b/.github/workflows/ci-unit-tests-docker.yml index 5f90fbf21..73834aa64 100644 --- a/.github/workflows/ci-unit-tests-docker.yml +++ b/.github/workflows/ci-unit-tests-docker.yml @@ -237,7 +237,7 @@ jobs: with: test_id: 'custom-conf' docker_image: ${{ vars.GAR_BASE }}/${{ vars.CI_IMAGE_NAME }}@${{ needs.build.outputs.image_digest }} - grep_patterns: '-e "v1.0.0-rc.2.toml"' + grep_patterns: '-e "loaded zebrad config.*config_path.*=.*v1.0.0-rc.2.toml"' test_variables: '-e NETWORK -e ZEBRA_CONF_PATH="zebrad/tests/common/configs/v1.0.0-rc.2.toml"' network: ${{ inputs.network || vars.ZCASH_NETWORK }}