diff --git a/ci/Dockerfile b/ci/Dockerfile index 56d66d51a7..3d0a429975 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -14,10 +14,22 @@ RUN apt-get update -qq && apt-get install -qq -y \ ca-certificates \ iputils-ping \ curl \ + wget \ git \ build-essential && \ apt-get clean +# Install GitHub CLI +RUN mkdir -p -m 755 /etc/apt/keyrings \ + && out=$(mktemp) && wget -nv -O$out https://cli.github.com/packages/githubcli-archive-keyring.gpg \ + && cat $out | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \ + && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \ + && mkdir -p -m 755 /etc/apt/sources.list.d \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ + && apt-get update \ + && apt-get install gh -y \ + && apt-get clean + # Install uv ARG UV_VERSION=0.6.12 ADD https://astral.sh/uv/${UV_VERSION}/install.sh /uv-installer.sh diff --git a/ci/cscs_gpu.yml b/ci/cscs_gpu.yml index f94cc9a67f..42e2b47d9f 100644 --- a/ci/cscs_gpu.yml +++ b/ci/cscs_gpu.yml @@ -36,6 +36,9 @@ test_cscs_gh200: - .container-runner-daint-gh200 image: ${CSCS_REGISTRY_PATH}/public/dace-gpu:${DOCKER_TAG} variables: + GIT_STRATEGY: clone + GIT_SUBMODULE_STRATEGY: recursive + GIT_CLONE_PATH: $WORKDIR/project-name TEST_VARIANTS: 'gpu' CSCS_CUDA_MPS: 1 SLURM_GPUS_PER_NODE: 4 @@ -50,11 +53,12 @@ test_cscs_gh200: # running the tests. The output folder is inside the docker image # (${WORKDIR}/dace), so it won't take up space on $SCRATCH but in a # ephemeral tmpfs mount in the running node. - - echo $CSCS_CI_ORIG_CLONE_URL - - mkdir -p "${WORKDIR}/dace" && git clone --recursive "${CSCS_CI_ORIG_CLONE_URL}" "${WORKDIR}/dace" + #- echo $CSCS_CI_ORIG_CLONE_URL + #- mkdir -p "${WORKDIR}/dace" && git clone --recursive "${CSCS_CI_ORIG_CLONE_URL}" "${WORKDIR}/dace" - cd "${WORKDIR}/dace" - - git fetch --depth 1 origin "${CI_COMMIT_SHA}" - - git checkout "${CI_COMMIT_SHA}" + #- git fetch --depth 1 origin "${CI_COMMIT_SHA}" + #- git checkout "${CI_COMMIT_SHA}" + - echo $(git rev-parse --abbrev-ref HEAD) - uv pip install -e ".[testing]" - export DACE_cache=unique - pytest --cov-report=xml --cov=dace --tb=short --timeout_method thread --timeout=300 -n 32 -m "${TEST_VARIANTS}"