mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 08:40:50 +00:00
Merge pull request #54668 from Avogar/better-ci-libs
Move all `tests/ci/*.lib files` to `stateless-tests` image
This commit is contained in:
commit
3af3114478
@ -88,5 +88,10 @@ RUN npm install -g azurite \
|
|||||||
COPY run.sh /
|
COPY run.sh /
|
||||||
COPY setup_minio.sh /
|
COPY setup_minio.sh /
|
||||||
COPY setup_hdfs_minicluster.sh /
|
COPY setup_hdfs_minicluster.sh /
|
||||||
|
COPY attach_gdb.lib /
|
||||||
|
COPY utils.lib /
|
||||||
|
|
||||||
|
# We store stress_tests.lib in stateless image to avoid duplication of this file in stress and upgrade tests
|
||||||
|
COPY stress_tests.lib /
|
||||||
|
|
||||||
CMD ["/bin/bash", "/run.sh"]
|
CMD ["/bin/bash", "/run.sh"]
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
source /usr/share/clickhouse-test/ci/utils.lib
|
source /utils.lib
|
||||||
|
|
||||||
function attach_gdb_to_clickhouse()
|
function attach_gdb_to_clickhouse()
|
||||||
{
|
{
|
@ -22,10 +22,10 @@ dpkg -i package_folder/clickhouse-client_*.deb
|
|||||||
ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
|
ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
source /usr/share/clickhouse-test/ci/attach_gdb.lib || true # FIXME: to not break old builds, clean on 2023-09-01
|
source /attach_gdb.lib
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
source /usr/share/clickhouse-test/ci/utils.lib || true # FIXME: to not break old builds, clean on 2023-09-01
|
source /utils.lib
|
||||||
|
|
||||||
# install test configs
|
# install test configs
|
||||||
/usr/share/clickhouse-test/config/install.sh
|
/usr/share/clickhouse-test/config/install.sh
|
||||||
|
@ -16,8 +16,8 @@ ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
|
|||||||
|
|
||||||
# Stress tests and upgrade check uses similar code that was placed
|
# Stress tests and upgrade check uses similar code that was placed
|
||||||
# in a separate bash library. See tests/ci/stress_tests.lib
|
# in a separate bash library. See tests/ci/stress_tests.lib
|
||||||
source /usr/share/clickhouse-test/ci/attach_gdb.lib
|
source /attach_gdb.lib
|
||||||
source /usr/share/clickhouse-test/ci/stress_tests.lib
|
source /stress_tests.lib
|
||||||
|
|
||||||
install_packages package_folder
|
install_packages package_folder
|
||||||
|
|
||||||
|
@ -16,8 +16,8 @@ ln -s /usr/share/clickhouse-test/ci/get_previous_release_tag.py /usr/bin/get_pre
|
|||||||
|
|
||||||
# Stress tests and upgrade check uses similar code that was placed
|
# Stress tests and upgrade check uses similar code that was placed
|
||||||
# in a separate bash library. See tests/ci/stress_tests.lib
|
# in a separate bash library. See tests/ci/stress_tests.lib
|
||||||
source /usr/share/clickhouse-test/ci/attach_gdb.lib
|
source /attach_gdb.lib
|
||||||
source /usr/share/clickhouse-test/ci/stress_tests.lib
|
source /stress_tests.lib
|
||||||
|
|
||||||
azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
|
azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
|
||||||
./setup_minio.sh stateless # to have a proper environment
|
./setup_minio.sh stateless # to have a proper environment
|
||||||
|
Loading…
Reference in New Issue
Block a user