diff --git a/dbms/tests/queries/0_stateless/00975_recursive_materialized_view.sql b/dbms/tests/queries/0_stateless/00975_recursive_materialized_view.sql index 21bf0381cd4..4ca7bc436bf 100644 --- a/dbms/tests/queries/0_stateless/00975_recursive_materialized_view.sql +++ b/dbms/tests/queries/0_stateless/00975_recursive_materialized_view.sql @@ -1,5 +1,6 @@ DROP TABLE IF EXISTS test.src; DROP TABLE IF EXISTS test.dst1; +DROP TABLE IF EXISTS test.src_to_dst1; DROP TABLE IF EXISTS test.dst2; USE test; diff --git a/dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop.reference b/dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference similarity index 100% rename from dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop.reference rename to dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference diff --git a/dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop.sh b/dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh similarity index 100% rename from dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop.sh rename to dbms/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile index 20cab726056..5cb3808fab9 100644 --- a/docker/packager/binary/Dockerfile +++ b/docker/packager/binary/Dockerfile @@ -6,14 +6,19 @@ RUN apt-get --allow-unauthenticated update -y \ apt-get --allow-unauthenticated install --yes --no-install-recommends \ bash \ fakeroot \ - cmake \ ccache \ curl \ - software-properties-common + software-properties-common \ + gnupg \ + apt-transport-https \ + ca-certificates RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN curl https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - +RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' + RUN apt-get update -y \ && env DEBIAN_FRONTEND=noninteractive \ @@ -49,7 +54,8 @@ RUN apt-get update -y \ gperf \ git \ tzdata \ - gperf + gperf \ + cmake COPY build.sh / CMD ["/bin/bash", "/build.sh"] diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile index 7410920a462..a48fdbd8895 100644 --- a/docker/packager/deb/Dockerfile +++ b/docker/packager/deb/Dockerfile @@ -6,14 +6,19 @@ RUN apt-get --allow-unauthenticated update -y \ apt-get --allow-unauthenticated install --yes --no-install-recommends \ bash \ fakeroot \ - cmake \ ccache \ curl \ - software-properties-common + software-properties-common \ + gnupg \ + apt-transport-https \ + ca-certificates + RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN curl https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - +RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' RUN apt-get --allow-unauthenticated update -y \ && env DEBIAN_FRONTEND=noninteractive \ @@ -72,7 +77,8 @@ RUN apt-get --allow-unauthenticated update -y \ tzdata \ gperf \ alien \ - libcapnp-dev + libcapnp-dev \ + cmake COPY build.sh / diff --git a/docker/test/pvs/Dockerfile b/docker/test/pvs/Dockerfile index b04e918d5f2..78fb6990773 100644 --- a/docker/test/pvs/Dockerfile +++ b/docker/test/pvs/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get --allow-unauthenticated update -y \ # apt-get --allow-unauthenticated install --yes --no-install-recommends \ # pvs-studio -ENV PKG_VERSION="pvs-studio-7.03.33446.1453-amd64.deb" +ENV PKG_VERSION="pvs-studio-7.04.34029.84-amd64.deb" RUN wget -q http://files.viva64.com/beta/$PKG_VERSION RUN sudo dpkg -i $PKG_VERSION