From 5b92723b5cdd551e4297cda0da5d5fb93a89caa6 Mon Sep 17 00:00:00 2001 From: "aleksei.bukhalov" Date: Sun, 6 Jul 2025 13:26:48 +0200 Subject: [PATCH] chore(ci): MCOL-6071 remove crb repo enabling for rocky in prepare_test_container.sh --- .drone.jsonnet | 2 +- build/prepare_test_container.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index dcaed9695..ac352a2aa 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -443,7 +443,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise", "echo $$DOCKER_PASSWORD | docker login --username $$DOCKER_LOGIN --password-stdin", "apk add bash && bash /mdb/" + builddir + "/storage/columnstore/columnstore/build/run_multi_node_mtr.sh " + - "--columnstore-image-name $${MCS_IMAGE_NAME}" + + "--columnstore-image-name $${MCS_IMAGE_NAME} " + "--distro " + platform, ], }, diff --git a/build/prepare_test_container.sh b/build/prepare_test_container.sh index e43978973..83abaeb5e 100755 --- a/build/prepare_test_container.sh +++ b/build/prepare_test_container.sh @@ -105,7 +105,6 @@ fi # install deps if [[ "$RESULT" == *rocky* ]]; then - execInnerDockerWithRetry "$CONTAINER_NAME" 'dnf install -y dnf-plugins-core && dnf config-manager --set-enabled crb' execInnerDockerWithRetry "$CONTAINER_NAME" 'yum --nobest update -y && yum --nobest install -y cracklib-dicts diffutils elfutils epel-release expect findutils iproute gawk gcc-c++ gdb hostname lz4 patch perl procps-ng rsyslog sudo tar wget which' else change_ubuntu_mirror_in_docker "$CONTAINER_NAME" "us"