ci: upgrade tiflash-ci-base image to use rocky linux8 (pingcap#9556)

close pingcap#9562 * update base image to rocky linux 8 Signed-off-by: Lloyd-Pottiger <[email protected]> Co-authored-by: Lloyd-Pottiger <[email protected]> Co-authored-by: Lloyd-Pottiger <[email protected]>
yibin87 · Oct 31, 2024 · b30b00f · b30b00f
1 parent ceaf98d
commit b30b00f
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 14 deletions.
diff --git a/dbms/src/Storages/DeltaMerge/File/DMFileWithVectorIndexBlockInputStream.cpp b/dbms/src/Storages/DeltaMerge/File/DMFileWithVectorIndexBlockInputStream.cpp
@@ -170,7 +170,9 @@ std::tuple<Block, size_t> DMFileWithVectorIndexBlockInputStream::readByIndexRead
 
     auto begin = std::lower_bound(sorted_results.cbegin(), sorted_results.cend(), block_start_row_id);
     auto end = std::lower_bound(begin, sorted_results.cend(), index_reader_next_row_id);
-    const std::span<const VectorIndexViewer::Key> block_selected_rows{begin, end};
+    const std::span<const VectorIndexViewer::Key> block_selected_rows{
+        &*begin,
+        static_cast<size_t>(std::distance(begin, end))};
     vec_index_reader->read(vec_column, block_selected_rows, block_start_row_id, read_rows);
 
     block.insert(ColumnWithTypeAndName{std::move(vec_column), vec_cd.type, vec_cd.name, vec_cd.id});
@@ -198,7 +200,9 @@ std::tuple<Block, size_t> DMFileWithVectorIndexBlockInputStream::readByFollowing
     // Then read from vector index for the same pack.
     auto begin = std::lower_bound(sorted_results.cbegin(), sorted_results.cend(), block_others.startOffset());
     auto end = std::lower_bound(begin, sorted_results.cend(), block_others.startOffset() + read_rows);
-    const std::span<const VectorIndexViewer::Key> block_selected_rows{begin, end};
+    const std::span<const VectorIndexViewer::Key> block_selected_rows{
+        &*begin,
+        static_cast<size_t>(std::distance(begin, end))};
     vec_index_reader->read(vec_column, block_selected_rows, block_others.startOffset(), read_rows);
 
     // Re-assemble block using the same layout as header.

diff --git a/release-centos7-llvm/dockerfiles/Dockerfile-tiflash-ci b/release-centos7-llvm/dockerfiles/Dockerfile-tiflash-ci
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM hub.pingcap.net/tiflash/tiflash-ci-base:py3
+FROM hub.pingcap.net/tiflash/tiflash-ci-base:rocky8-20241028
 
 COPY tiflash /tiflash
 

diff --git a/release-centos7-llvm/dockerfiles/Dockerfile-tiflash-ci-base b/release-centos7-llvm/dockerfiles/Dockerfile-tiflash-ci-base
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM hub.pingcap.net/tiflash/centos:7.9.2009-amd64
+FROM ghcr.io/pingcap-qe/ci/jenkins/tiflash:v2024.10.8-24-gfd2cff2
 
 USER root
 WORKDIR /root/
@@ -22,6 +22,3 @@ ENV TZ Asia/Shanghai
 ENV LD_LIBRARY_PATH /tiflash
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN yum install mysql -y && yum clean all
-RUN yum install python3 -y && yum clean all
diff --git a/tests/docker/mock-test-dt.yaml b/tests/docker/mock-test-dt.yaml
@@ -17,7 +17,7 @@ version: '2.3'
 services:
   # tics0 container is for tests under delta-merge-test directory
   tics0:
-    image: hub.pingcap.net/tiflash/tiflash-ci-base:py3
+    image: hub.pingcap.net/tiflash/tiflash-ci-base:rocky8-20241028
     volumes:
       - ./config/tics_dt.toml:/config.toml:ro
       - ./data/tiflash:/tmp/tiflash/data

diff --git a/tests/docker/tiflash-dt-disable-encrypt.yaml b/tests/docker/tiflash-dt-disable-encrypt.yaml
@@ -18,7 +18,7 @@ services:
   # for tests under fullstack-test directory
   # (engine DeltaTree)
   tiflash0:
-    image: hub.pingcap.net/tiflash/tiflash-ci-base:py3
+    image: hub.pingcap.net/tiflash/tiflash-ci-base:rocky8-20241028
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/tiflash-dt-disable-local-tunnel.yaml b/tests/docker/tiflash-dt-disable-local-tunnel.yaml
@@ -18,7 +18,7 @@ services:
   # for tests under fullstack-test directory
   # (engine DeltaTree)
   tiflash0:
-    image: hub.pingcap.net/tiflash/tiflash-ci-base:py3
+    image: hub.pingcap.net/tiflash/tiflash-ci-base:rocky8-20241028
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/tiflash-dt-force-enable-lm.yaml b/tests/docker/tiflash-dt-force-enable-lm.yaml
@@ -18,7 +18,7 @@ services:
   # for tests under fullstack-test directory
   # (engine DeltaTree)
   tiflash0:
-    image: hub.pingcap.net/tiflash/tiflash-ci-base:py3
+    image: hub.pingcap.net/tiflash/tiflash-ci-base:rocky8-20241028
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/tiflash-dt-lightweight-compression.yaml b/tests/docker/tiflash-dt-lightweight-compression.yaml
@@ -18,7 +18,7 @@ services:
   # for tests under fullstack-test directory
   # (engine DeltaTree)
   tiflash0:
-    image: hub.pingcap.net/tiflash/tiflash-ci-base:py3
+    image: hub.pingcap.net/tiflash/tiflash-ci-base:rocky8-20241028
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/tiflash-dt-sync-grpc.yaml b/tests/docker/tiflash-dt-sync-grpc.yaml
@@ -18,7 +18,7 @@ services:
   # for tests under fullstack-test directory
   # (engine DeltaTree)
   tiflash0:
-    image: hub.pingcap.net/tiflash/tiflash-ci-base:py3
+    image: hub.pingcap.net/tiflash/tiflash-ci-base:rocky8-20241028
     security_opt:
       - seccomp:unconfined
     volumes:

diff --git a/tests/docker/tiflash-dt.yaml b/tests/docker/tiflash-dt.yaml
@@ -18,7 +18,7 @@ services:
   # for tests under fullstack-test directory
   # (engine DeltaTree)
   tiflash0:
-    image: hub.pingcap.net/tiflash/tiflash-ci-base:py3
+    image: hub.pingcap.net/tiflash/tiflash-ci-base:rocky8-20241028
     security_opt:
       - seccomp:unconfined
     volumes: