Skip to content

Commit

Permalink
t
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexSkrypnyk committed Sep 8, 2024
1 parent 8caa800 commit b7f22ba
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/vortex-test-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .vortex/tests/bats/_helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"
[ "$(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 "[email protected]"
commit=$(git_add_all_commit "Initial commit" "${dir}")

echo "${commit}"
Expand Down
4 changes: 2 additions & 2 deletions .vortex/tests/test.common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"
[ "$(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 "[email protected]"

# Create stub of local framework.
docker network create amazeeio-network 2>/dev/null || true
Expand Down
4 changes: 2 additions & 2 deletions .vortex/tests/test.deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"
[ "$(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 "[email protected]"

# Create stub of local framework.
docker network create amazeeio-network 2>/dev/null || true
Expand Down
4 changes: 2 additions & 2 deletions .vortex/tests/test.workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"
[ "$(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 "[email protected]"

# Create stub of local framework.
docker network create amazeeio-network 2>/dev/null || true
Expand Down

1 comment on commit b7f22ba

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.