Skip to content

Commit

Permalink
ci: fix macos tests
Browse files Browse the repository at this point in the history
Docker didn't work on macOS machine in special jobs in CI. The tests
stop and fail after a timeout expires.

After the patch, a special `colima` utility was added to CI that to
help the docker work properly.
  • Loading branch information
themilchenko committed Sep 20, 2024
1 parent 2319f9e commit c87f7b4
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 14 deletions.
40 changes: 29 additions & 11 deletions .github/workflows/full-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:

- name: Install dependencies
run: |
brew install --overwrite go mage wget node
brew install --overwrite go mage wget node docker colima docker-credential-helper
pip3 install -r test/requirements.txt
- name: Install etcd
Expand All @@ -175,23 +175,37 @@ jobs:
TT_CLI_BUILD_SSL: 'static'
run: mage build

- name: Install tarantool
# - name: Install tarantool
# run: |
# ./tt init
# ./tt install tarantool 3.0.2
# # Delete the tt config so that it does not affect the test environment.
# rm -f tt.yaml
#
# - name: Add Tarantool to Path
# run: |
# echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH

- name: Set Tarantool include directory to the environment
run: |
./tt init
./tt install tarantool 3.0.2
# Delete the tt config so that it does not affect the test environment.
rm -f tt.yaml
echo "TT_CLI_TARANTOOL_PREFIX=${GITHUB_WORKSPACE}/include/" >> $GITHUB_ENV
- name: Add Tarantool to Path
- name: Start colima and patch mount options
# Also we need to delete line with 'credSotre' to download docker image.
run: |
echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH
colima start --vm-type vz --mount /private/var/folders:w
- name: Set Tarantool include directory to the environment
- name: Print docker config
run: |
echo "TT_CLI_TARANTOOL_PREFIX=${GITHUB_WORKSPACE}/include/" >> $GITHUB_ENV
cat ~/.docker/config.json
docker rmi -f $(docker images -aq)
- name: Docker build
run: docker build -t ubuntu:tt_test cli/docker/testdata/

- name: Run unit tests
run: mage unitfull
# run: mage -v unitfull
run: go test -C cli/docker -tags integration,integration_docker

- name: Integration tests
run: mage integrationfull
Expand All @@ -212,6 +226,10 @@ jobs:
TARANTOOL_BIN=${GITHUB_WORKSPACE}/bin/tarantool;
pkill -SIGINT -f ${TARANTOOL_BIN} || true
- name: Kill colima
if: always()
run: colima delete

# ee suffix means that the job runs ee integration tests.
full-ci-macOS-ee:
if: |
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ jobs:

- name: Install dependencies
run: |
brew install --overwrite go mage node
brew install --overwrite go mage node docker colima
pip3 install -r test/requirements.txt
- name: Install etcd
Expand Down Expand Up @@ -189,6 +189,9 @@ jobs:
- name: Unit tests
run: mage unit

- name: Start colima and patch mount options
run: colima start --vm-type vz --mount /private/var/folders:w

- name: Run integration tests
run: mage integration

Expand All @@ -201,3 +204,7 @@ jobs:
run: |
ETCD_TT_BIN=${ETCD_PATH}etcd;
pkill -SIGINT -f ${ETCD_TT_BIN} || true
- name: Kill colima
if: always()
run: colima delete
4 changes: 2 additions & 2 deletions cli/docker/docker_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ func TestBuildImage(t *testing.T) {
client.WithAPIVersionNegotiation())
require.NoError(t, err)
defer dockerClient.Close()
t.Cleanup(func() { findAndRemoveBuiltImage(t, dockerClient, "ubuntu:tt_test") })

require.NoError(t, buildDockerImage(dockerClient, "ubuntu:tt_test", "testdata", false,
require.NoError(t, buildDockerImage(dockerClient, "ubuntu:tt_test", "testdata", true,
os.Stdout))
findAndRemoveBuiltImage(t, dockerClient, "ubuntu:tt_test")
}

func TestBuildImageFail(t *testing.T) {
Expand Down

0 comments on commit c87f7b4

Please sign in to comment.