Skip to content

Commit 56d9373

Browse files
win5923win5923
committed
Fix pattern contains path separator
Signed-off-by: win5923 <ken89@kimo.com>
1 parent 507e7df commit 56d9373

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

‎.buildkite/test-e2e.yml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
- bash ../.buildkite/build-start-operator.sh
1111
- kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
1212
# Run e2e tests and print KubeRay operator logs if tests fail
13-
- echo "--- START:Running e2e rayservice (nightly operator) tests"
13+
- echo "--- START:Running e2e (nightly operator) tests"
1414
- if [ -n "${KUBERAY_TEST_RAY_IMAGE}"]; then echo "Using Ray Image ${KUBERAY_TEST_RAY_IMAGE}"; fi
15-
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR="$(pwd)/tmp"
1615
- set -o pipefail
17-
- KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2e 2>&1 | awk -f ../.buildkite/format.awk | tee ${KUBERAY_TEST_OUTPUT_DIR}/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee ${KUBERAY_TEST_OUTPUT_DIR}/kuberay-operator.log && tar -cf /artifact-mount/e2e-log.tar ${KUBERAY_TEST_OUTPUT_DIR}/*.log && exit 1)
18-
- echo "--- END:e2e rayservice (nightly operator) tests finished"
16+
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR=$(pwd)/tmp
17+
- echo "KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR"
18+
- KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2e 2>&1 | awk -f ../.buildkite/format.awk | tee $$KUBERAY_TEST_OUTPUT_DIR/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee $$KUBERAY_TEST_OUTPUT_DIR/kuberay-operator.log && find "$$KUBERAY_TEST_OUTPUT_DIR" -name "*.log" | tar -cf /artifact-mount/e2e-log.tar -T - && exit 1)
19+
- echo "--- END:e2e (nightly operator) tests finished"
1920

2021
- label: 'Test E2E rayservice (nightly operator)'
2122
instance_size: large
@@ -30,10 +31,11 @@
3031
- kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
3132
# Run e2e tests and print KubeRay operator logs if tests fail
3233
- echo "--- START:Running e2e rayservice (nightly operator) tests"
33-
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR="$(pwd)/tmp"
3434
- if [ -n "${KUBERAY_TEST_RAY_IMAGE}"]; then echo "Using Ray Image ${KUBERAY_TEST_RAY_IMAGE}"; fi
3535
- set -o pipefail
36-
- KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2erayservice 2>&1 | awk -f ../.buildkite/format.awk | tee ${KUBERAY_TEST_OUTPUT_DIR}/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee ${KUBERAY_TEST_OUTPUT_DIR}/kuberay-operator.log && tar -cf /artifact-mount/e2e-rayservice-log.tar ${KUBERAY_TEST_OUTPUT_DIR}/*.log && exit 1)
36+
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR=$(pwd)/tmp
37+
- echo "KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR"
38+
- KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2erayservice 2>&1 | awk -f ../.buildkite/format.awk | tee $$KUBERAY_TEST_OUTPUT_DIR/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee $$KUBERAY_TEST_OUTPUT_DIR/kuberay-operator.log && find "$$KUBERAY_TEST_OUTPUT_DIR" -name "*.log" | tar -cf /artifact-mount/e2e-rayservice-log.tar -T - && exit 1)
3739
- echo "--- END:e2e rayservice (nightly operator) tests finished"
3840

3941
- label: 'Test Autoscaler E2E (nightly operator)'
@@ -49,10 +51,11 @@
4951
- kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
5052
# Run e2e tests and print KubeRay operator logs if tests fail
5153
- echo "--- START:Running Autoscaler e2e (nightly operator) tests"
52-
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR="$(pwd)/tmp"
5354
- if [ -n "${KUBERAY_TEST_RAY_IMAGE}"]; then echo "Using Ray Image ${KUBERAY_TEST_RAY_IMAGE}"; fi
5455
- set -o pipefail
55-
- KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2eautoscaler 2>&1 | awk -f ../.buildkite/format.awk | tee ${KUBERAY_TEST_OUTPUT_DIR}/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee ${KUBERAY_TEST_OUTPUT_DIR}/kuberay-operator.log && tar -cf /artifact-mount/e2e-autoscaler-log.tar ${KUBERAY_TEST_OUTPUT_DIR}/*.log && exit 1)
56+
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR=$(pwd)/tmp
57+
- echo "KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR"
58+
- KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2eautoscaler 2>&1 | awk -f ../.buildkite/format.awk | tee $$KUBERAY_TEST_OUTPUT_DIR/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee $$KUBERAY_TEST_OUTPUT_DIR/kuberay-operator.log && find "$$KUBERAY_TEST_OUTPUT_DIR" -name "*.log" | tar -cf /artifact-mount/e2e-autoscaler-log.tar -T - && exit 1)
5659
- echo "--- END:Autoscaler e2e (nightly operator) tests finished"
5760

5861
- label: 'Test E2E Operator Version Upgrade (v1.3.0)'
@@ -69,8 +72,9 @@
6972
- kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
7073
# Run e2e tests and print KubeRay operator logs if tests fail
7174
- echo "--- START:Running e2e Operator upgrade (v1.2.2 to v1.3.0 operator) tests"
72-
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR="$(pwd)/tmp"
73-
- KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m KUBERAY_TEST_UPGRADE_IMAGE=v1.3.0 go test -timeout 30m -v ./test/e2eupgrade 2>&1 | awk -f ../.buildkite/format.awk | tee ${KUBERAY_TEST_OUTPUT_DIR}/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee ${KUBERAY_TEST_OUTPUT_DIR}/kuberay-operator.log && tar -cf /artifact-mount/e2e-upgrade-log.tar ${KUBERAY_TEST_OUTPUT_DIR}/*.log && exit 1)
75+
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR=$(pwd)/tmp
76+
- echo "KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR"
77+
- KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m KUBERAY_TEST_UPGRADE_IMAGE=v1.3.0 go test -timeout 30m -v ./test/e2eupgrade 2>&1 | awk -f ../.buildkite/format.awk | tee $$KUBERAY_TEST_OUTPUT_DIR/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee $$KUBERAY_TEST_OUTPUT_DIR/kuberay-operator.log && find "$$KUBERAY_TEST_OUTPUT_DIR" -name "*.log" | tar -cf /artifact-mount/e2e-upgrade-log.tar -T - && exit 1)
7478
- echo "--- END:e2e Operator upgrade (v1.2.2 to v1.3.0 operator) tests finished"
7579

7680
- label: 'Test Apiserver E2E (nightly operator)'
@@ -90,7 +94,8 @@
9094
- kubectl wait --namespace ray-system --for=condition=Available --timeout=90s deployment/kuberay-apiserver -n ray-system
9195
# Run e2e tests and print KubeRay api server logs if tests fail
9296
- echo "--- START:Running e2e apiserver (nightly operator) tests"
93-
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR="$(pwd)/tmp"
9497
- set -o pipefail
95-
- E2E_API_SERVER_URL="http://docker:31888" go test -parallel 4 -timeout 60m -v ./test/e2e/... 2>&1 | awk -f ../.buildkite/format.awk | tee ${KUBERAY_TEST_OUTPUT_DIR}/gotest.log || (kubectl logs -l app.kubernetes.io/component=kuberay-apiserver --namespace ray-system | tee ${KUBERAY_TEST_OUTPUT_DIR}/kuberay-apiserver.log && tar -cf /artifact-mount/e2e-apiserver-log.tar ${KUBERAY_TEST_OUTPUT_DIR}/*.log && exit 1)
98+
- mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR=$(pwd)/tmp
99+
- echo "KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR"
100+
- KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR E2E_API_SERVER_URL="http://docker:31888" go test -parallel 4 -timeout 60m -v ./test/e2e/... 2>&1 | awk -f ../.buildkite/format.awk | tee $$KUBERAY_TEST_OUTPUT_DIR/gotest.log || (kubectl logs -l app.kubernetes.io/component=kuberay-apiserver --namespace ray-system | tee $$KUBERAY_TEST_OUTPUT_DIR/kuberay-apiserver.log && find "$$KUBERAY_TEST_OUTPUT_DIR" -name "*.log" | tar -cf /artifact-mount/e2e-apiserver-log.tar -T - && exit 1)
96101
- echo "--- END:Apiserver e2e (nightly operator) tests finished"

‎ray-operator/test/support/test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"os"
77
"path"
8+
"strings"
89
"sync"
910
"testing"
1011
"time"
@@ -91,7 +92,8 @@ func (t *T) OutputDir() string {
9192
}
9293
}
9394
LogWithTimestamp(t.T(), "Creating output directory in parent directory: %s", parent)
94-
dir, err := os.MkdirTemp(parent, t.T().Name())
95+
safeName := strings.ReplaceAll(t.T().Name(), "/", "_")
96+
dir, err := os.MkdirTemp(parent, safeName)
9597
if err != nil {
9698
t.T().Fatalf("Error creating output directory: %v", err)
9799
}

0 commit comments

Comments
 (0)