Skip to content

Commit 94e2fd0

Browse files
authored
[ci] Refactor testing logic (#1236)
* Simplify test discovery logic in workflow. * Delete Clickhouse after successful test. * Separate two k8s tests into separate jobs.
2 parents a03530a + 640d0f1 commit 94e2fd0

5 files changed

Lines changed: 14 additions & 11 deletions

File tree

‎.github/workflows/pull-requests.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,7 @@ jobs:
264264
- uses: actions/checkout@v4
265265
- id: set
266266
run: |
267-
apps=$(find hack/e2e-apps -maxdepth 1 -mindepth 1 -name '*.bats' | \
268-
awk -F/ '{sub(/\..+/, "", $NF); print $NF}' | jq -R . | jq -cs .)
267+
apps=$(ls hack/e2e-apps/*.bats | cut -f3 -d/ | cut -f1 -d. | jq -R | jq -cs)
269268
echo "matrix={\"app\":$apps}" >> "$GITHUB_OUTPUT"
270269
271270
test_apps:

‎hack/e2e-apps/clickhouse.bats‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ EOF
3838
timeout 100 sh -ec "until kubectl -n tenant-test get svc chi-clickhouse-$name-clickhouse-0-0 -o jsonpath='{.spec.ports[*].port}' | grep -q '9000 8123 9009'; do sleep 10; done"
3939
timeout 80 sh -ec "until kubectl -n tenant-test get sts chi-clickhouse-$name-clickhouse-0-1 ; do sleep 10; done"
4040
kubectl -n tenant-test wait statefulset.apps/chi-clickhouse-$name-clickhouse-0-1 --timeout=140s --for=jsonpath='{.status.replicas}'=1
41+
kubectl -n tenant-test delete clickhouse $name
4142
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bats
2+
3+
@test "Create a tenant Kubernetes control plane with latest version" {
4+
. hack/e2e-apps/run-kubernetes.sh
5+
run_kubernetes_test 'keys | sort_by(.) | .[-1]' 'test-latest-version' '59991'
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bats
2+
3+
@test "Create a tenant Kubernetes control plane with previous version" {
4+
. hack/e2e-apps/run-kubernetes.sh
5+
run_kubernetes_test 'keys | sort_by(.) | .[-2]' 'test-previous-version' '59992'
6+
}
Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/usr/bin/env bats
2-
31
run_kubernetes_test() {
42
local version_expr="$1"
53
local test_name="$2"
@@ -104,10 +102,3 @@ EOF
104102
kubectl -n tenant-test delete kuberneteses.apps.cozystack.io $test_name
105103

106104
}
107-
108-
@test "Create a tenant Kubernetes control plane with latest version" {
109-
run_kubernetes_test 'keys | sort_by(.) | .[-1]' 'test-latest-version' '59991'
110-
}
111-
@test "Create a tenant Kubernetes control plane with previous version" {
112-
run_kubernetes_test 'keys | sort_by(.) | .[-2]' 'test-previous-version' '59992'
113-
}

0 commit comments

Comments
 (0)