From 11637c6a6d6661b00537c2a66ddfa6be8686f6c4 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Wed, 3 May 2023 13:01:26 +0530 Subject: [PATCH] Add setup to run the GPU tests on Azure Signed-off-by: Sayan Chowdhury --- ci-automation/vendor-testing/azure.sh | 4 ++-- .../nvidia-drivers/files/bin/setup-nvidia | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh index 17081b3598..88509f64ee 100755 --- a/ci-automation/vendor-testing/azure.sh +++ b/ci-automation/vendor-testing/azure.sh @@ -74,7 +74,7 @@ query_kola_tests() { kola list --platform=azure --filter "${@}" } -other_instance_types=() +other_instance_types=("Standard_NC6s_v3") if [[ "${CIA_ARCH}" = 'amd64' ]]; then other_instance_types+=('V1') fi @@ -85,6 +85,6 @@ run_kola_tests_on_instances \ "${CIA_FIRST_RUN}" \ "${other_instance_types[@]}" \ '--' \ - 'cl.internet' \ + 'cl.internet' 'cl.misc.nvidia'\ '--' \ "${@}" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia index a59a3ce6b4..588ef082e5 100644 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia @@ -24,15 +24,12 @@ function download_flatcar_developer_container() { then rm -f "${FLATCAR_ROOT_WORKDIR}/"flatcar_developer_container*.bin FLATCAR_REMOTE_FILENAME=${FLATCAR_DEVELOPER_CONTAINER%%-*}.bin.bz2 - if [[ "$GROUP" == "developer" ]] + if [[ "$(curl -I -s -o /dev/null -w "%{http_code}" "https://${GROUP}.release.flatcar-linux.net/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_REMOTE_FILENAME}")" == 200 ]] then - FLATCAR_DEVELOPER_CONTAINER_URL="https://bucket.release.flatcar-linux.net/flatcar-jenkins/developer/developer/boards/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_REMOTE_FILENAME}" - else if [[ "$(curl -I -s -o /dev/null -w "%{http_code}" "https://${GROUP}.release.flatcar-linux.net/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_REMOTE_FILENAME}")" == 200 ]] - then - FLATCAR_DEVELOPER_CONTAINER_URL="https://${GROUP}.release.flatcar-linux.net/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_REMOTE_FILENAME}" - else - FLATCAR_DEVELOPER_CONTAINER_URL="https://bucket.release.flatcar-linux.net/flatcar-jenkins/${GROUP}/boards/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_REMOTE_FILENAME}" - fi + FLATCAR_DEVELOPER_CONTAINER_URL="https://${GROUP}.release.flatcar-linux.net/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_REMOTE_FILENAME}" + else + FLATCAR_RELEASE_BOARD=${FLATCAR_RELEASE_BOARD//-usr/} + FLATCAR_DEVELOPER_CONTAINER_URL="https://bincache.flatcar-linux.net/images/${FLATCAR_RELEASE_BOARD}/${FLATCAR_RELEASE_VERSION}/${FLATCAR_REMOTE_FILENAME}" fi if [ ! -n "${FLATCAR_DEVELOPER_CONTAINER_URL}" ]