Skip to content

Commit

Permalink
revert ci image and rename python.slt
Browse files Browse the repository at this point in the history
  • Loading branch information
wangrunji0408 committed Jun 9, 2023
1 parent 0effbc6 commit 7db2f43
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
RUN cargo binstall -y --no-symlinks cargo-llvm-cov cargo-nextest cargo-udeps cargo-hakari cargo-sort cargo-make cargo-cache cargo-audit \
&& cargo install sccache --locked \
&& cargo install sqllogictest-bin --locked \
&& cargo install --git https://github.com/risinglightdb/sqllogictest-rs --rev dbadddb --bin sqllogictest --locked \
&& cargo cache -a \
&& rm -rf "/root/.cargo/registry/index" \
&& rm -rf "/root/.cargo/registry/cache" \
Expand Down
2 changes: 1 addition & 1 deletion ci/build-ci-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cat ../rust-toolchain
# !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
# AND ALSO docker-compose.yml #
######################################################
export BUILD_ENV_VERSION=v20230609
export BUILD_ENV_VERSION=v20230531

export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"

Expand Down
10 changes: 5 additions & 5 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ services:
retries: 5

source-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
depends_on:
- mysql
- db
Expand All @@ -79,20 +79,20 @@ services:
- ..:/risingwave

sink-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
depends_on:
- mysql
- db
volumes:
- ..:/risingwave

rw-build-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
volumes:
- ..:/risingwave

ci-flamegraph-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
# NOTE(kwannoel): This is used in order to permit
# syscalls for `nperf` (perf_event_open),
# so it can do CPU profiling.
Expand All @@ -103,7 +103,7 @@ services:
- ..:/risingwave

regress-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
depends_on:
db:
condition: service_healthy
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/run-e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ sqllogictest -p 4566 -d test './e2e_test/database/test.slt'
echo "--- e2e, ci-3streaming-2serving-3fe, python udf"
python3 e2e_test/udf/test.py &
sleep 2
sqllogictest -p 4566 -d dev --label python './e2e_test/udf/python.slt'
sqllogictest -p 4566 -d dev './e2e_test/udf/udf.slt'
pkill python3

echo "--- e2e, ci-3streaming-2serving-3fe, java udf"
java -jar risingwave-udf-example.jar &
sleep 2
sqllogictest -p 4566 -d dev --label java './e2e_test/udf/python.slt'
sqllogictest -p 4566 -d dev './e2e_test/udf/udf.slt'
pkill java

echo "--- Kill cluster"
Expand Down
2 changes: 2 additions & 0 deletions e2e_test/udf/python.slt → e2e_test/udf/udf.slt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Before running this test:
# python3 e2e_test/udf/test.py
# or:
# cd src/udf/java && mvn package && java -jar target/risingwave-udf-example.jar

# Create a function.
statement ok
Expand Down

0 comments on commit 7db2f43

Please sign in to comment.