From b7f22ba1256f417b5821cf094704f8ec74cc01ec Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Mon, 9 Sep 2024 09:33:44 +1000 Subject: [PATCH] t --- .github/workflows/vortex-test-common.yml | 7 ++++--- .vortex/tests/bats/_helper.bash | 4 ++-- .vortex/tests/test.common.sh | 4 ++-- .vortex/tests/test.deployment.sh | 4 ++-- .vortex/tests/test.workflow.sh | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/vortex-test-common.yml b/.github/workflows/vortex-test-common.yml index 1a65ba443..983772646 100644 --- a/.github/workflows/vortex-test-common.yml +++ b/.github/workflows/vortex-test-common.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest container: - image: drevops/ci-runner:latest + image: drevops/ci-runner:24.9.0 env: # Prevent GitHub overriding the Docker config. DOCKER_CONFIG: /root/.docker @@ -89,7 +89,7 @@ jobs: batch: [0, 1, 2] container: - image: drevops/ci-runner:latest + image: drevops/ci-runner:24.9.0 env: # Prevent GitHub overriding the Docker config. DOCKER_CONFIG: /root/.docker @@ -141,7 +141,7 @@ jobs: batch: [0, 1] container: - image: drevops/ci-runner:latest + image: drevops/ci-runner:24.9.0 env: # Prevent GitHub overriding the Docker config. DOCKER_CONFIG: /root/.docker @@ -179,6 +179,7 @@ jobs: - name: Run tests run: ./tests/test.deployment.sh working-directory: .vortex + timeout-minutes: 10 - name: Upload coverage report as an artifact uses: actions/upload-artifact@v4 diff --git a/.vortex/tests/bats/_helper.bash b/.vortex/tests/bats/_helper.bash index 1405e1453..d1934c044 100644 --- a/.vortex/tests/bats/_helper.bash +++ b/.vortex/tests/bats/_helper.bash @@ -1218,8 +1218,8 @@ prepare_local_repo() { fi git_init 0 "${dir}" - [ "$(git config --global user.name)" = "" ] && echo "Configuring global git user name." && git config --global user.name "Some User" - [ "$(git config --global user.email)" = "" ] && echo "Configuring global git user email." && git config --global user.email "some.user@example.com" + [ "$(git config --global user.name)" = "" ] && echo "Configuring global test git user name." && git config --global user.name "Some User" + [ "$(git config --global user.email)" = "" ] && echo "Configuring global test git user email." && git config --global user.email "some.user@example.com" commit=$(git_add_all_commit "Initial commit" "${dir}") echo "${commit}" diff --git a/.vortex/tests/test.common.sh b/.vortex/tests/test.common.sh index 972ce06a3..f8f5b602e 100755 --- a/.vortex/tests/test.common.sh +++ b/.vortex/tests/test.common.sh @@ -16,8 +16,8 @@ TEST_DIR="${ROOT_DIR}/.vortex/tests" # ------------------------------------------------------------------------------ # Configure git username and email if it is not set. -[ "$(git config --global user.name)" = "" ] && echo "==> Configuring global git user name" && git config --global user.name "Test user" -[ "$(git config --global user.email)" = "" ] && echo "==> Configuring global git user email" && git config --global user.email "someone@example.com" +[ "$(git config --global user.name)" = "" ] && echo "==> Configuring global test git user name" && git config --global user.name "Test user" +[ "$(git config --global user.email)" = "" ] && echo "==> Configuring global test git user email" && git config --global user.email "someone@example.com" # Create stub of local framework. docker network create amazeeio-network 2>/dev/null || true diff --git a/.vortex/tests/test.deployment.sh b/.vortex/tests/test.deployment.sh index 48893379b..5ab2bd568 100755 --- a/.vortex/tests/test.deployment.sh +++ b/.vortex/tests/test.deployment.sh @@ -16,8 +16,8 @@ TEST_DIR="${ROOT_DIR}/.vortex/tests" # ------------------------------------------------------------------------------ # Configure git username and email if it is not set. -[ "$(git config --global user.name)" = "" ] && echo "==> Configuring global git user name" && git config --global user.name "Test user" -[ "$(git config --global user.email)" = "" ] && echo "==> Configuring global git user email" && git config --global user.email "someone@example.com" +[ "$(git config --global user.name)" = "" ] && echo "==> Configuring global test git user name" && git config --global user.name "Test user" +[ "$(git config --global user.email)" = "" ] && echo "==> Configuring global test git user email" && git config --global user.email "someone@example.com" # Create stub of local framework. docker network create amazeeio-network 2>/dev/null || true diff --git a/.vortex/tests/test.workflow.sh b/.vortex/tests/test.workflow.sh index 923c383c1..614b4394c 100755 --- a/.vortex/tests/test.workflow.sh +++ b/.vortex/tests/test.workflow.sh @@ -16,8 +16,8 @@ TEST_DIR="${ROOT_DIR}/.vortex/tests" # ------------------------------------------------------------------------------ # Configure git username and email if it is not set. -[ "$(git config --global user.name)" = "" ] && echo "==> Configuring global git user name" && git config --global user.name "Test user" -[ "$(git config --global user.email)" = "" ] && echo "==> Configuring global git user email" && git config --global user.email "someone@example.com" +[ "$(git config --global user.name)" = "" ] && echo "==> Configuring global test git user name" && git config --global user.name "Test user" +[ "$(git config --global user.email)" = "" ] && echo "==> Configuring global test git user email" && git config --global user.email "someone@example.com" # Create stub of local framework. docker network create amazeeio-network 2>/dev/null || true