Skip to content

Commit bef5387

Browse files
committed
Use arm foundationdb. Split git action into steps
1 parent c26818b commit bef5387

19 files changed

Lines changed: 87 additions & 1704 deletions

.github/workflows/tests.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,11 @@ jobs:
1818
- name: Set up Docker Compose
1919
uses: docker/setup-compose-action@v1
2020

21-
- name: Run E2E tests
22-
run: make e2e-test
21+
- name: Start K3S
22+
run: make start-k3s
23+
24+
- name: Run load test
25+
run: make test-load
26+
27+
- name: Run conformance test
28+
run: make test-conformance

Makefile

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,29 @@ build:
88
--target=multi-arch-package \
99
-t multi-arch-build:latest .
1010

11-
.PHONY: e2e-test
12-
e2e-test:
11+
.PHONY: start-k3s
12+
start-k3s:
1313
docker compose up -d --force-recreate --build
14-
./tests/test.sh
14+
@bash -c '\
15+
until docker exec k3s test -f /etc/rancher/k3s/k3s.yaml; do \
16+
echo "Waiting for /etc/rancher/k3s/k3s.yaml..."; \
17+
sleep 1; \
18+
done; \
19+
echo "k3s.yaml is ready."; \
20+
until docker exec k3s kubectl get pods -A &>/dev/null; do \
21+
echo "Waiting for pods..."; \
22+
sleep 1; \
23+
done; \
24+
echo "kubectl is ready." \
25+
'
26+
27+
.PHONY: test-conformance
28+
test-conformance:
29+
./tests/conformance/test.sh
30+
31+
.PHONY: test-load
32+
test-load:
33+
./tests/load/test.sh
34+
35+
.PHONY: test-all
36+
test-all: test-load test-conformance

docker-compose.yaml

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,25 @@
11
services:
22
fdb:
33
container_name: fdb
4-
image: foundationdb/foundationdb:7.3.69
5-
platform: "linux/amd64"
6-
environment:
7-
FDB_COORDINATOR: fdb
8-
FDB_NETWORKING_MODE: container
9-
FDB_COORDINATOR_PORT: 4500
10-
FDB_PORT: 4500
11-
fdb_setup:
12-
container_name: fdb_setup
13-
image: foundationdb/foundationdb:7.3.69
14-
environment:
15-
FDB_COORDINATOR: fdb
16-
FDB_COORDINATOR_PORT: 4500
17-
entrypoint: >
18-
bash -c '
19-
echo docker:docker@fdb:4500 > /var/fdb/fdb.cluster
20-
if ! fdbcli --exec status --timeout 3 ; then
21-
echo "creating the database"
22-
if ! fdbcli --exec "configure new single ssd ; status" --timeout 10 ; then
23-
echo "Unable to configure new FDB cluster."
24-
exit 1
25-
fi
26-
fi
27-
'
4+
image: ghcr.io/melgenek/f8n/foundationdb:7.3.69
5+
post_start:
6+
- command: >
7+
bash -c '
8+
while [ ! -f /var/fdb/fdb.cluster ]; do
9+
sleep 0.1
10+
done
11+
if ! fdbcli --exec status --timeout 3 ; then
12+
echo "creating the database"
13+
if ! fdbcli --exec "configure single ssd ; status" --timeout 10 ; then
14+
echo "Unable to configure new FDB cluster."
15+
exit 1
16+
fi
17+
fi
18+
'
2819
f8n:
2920
container_name: f8n
3021
depends_on:
31-
- fdb_setup
22+
- fdb
3223
build:
3324
context: .
3425
dockerfile: Dockerfile
@@ -57,4 +48,4 @@ services:
5748

5849
volumes:
5950
kubeconfig:
60-
name: kubeconfig
51+
name: kubeconfig

test_runs/loadmap_bad_incr.md

Lines changed: 0 additions & 187 deletions
This file was deleted.

0 commit comments

Comments
 (0)