From a47fb6586f3e795e77756f846a5f19ebd8a13bb6 Mon Sep 17 00:00:00 2001 From: "ryan.kuba" Date: Wed, 11 May 2022 13:29:44 -0400 Subject: [PATCH] use default dind base to run test linking --- .gitlab-ci.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4471bc6..0864767 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -540,13 +540,10 @@ manifest_dev: link_tests_single_arch_dev: stage: linktests - image: - name: amazon/aws-cli - entrypoint: [""] script: - - yum install -y curl + - apk add curl - STATUS=$(curl -sL https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/x86_64/kasmweb/${KASM_IMAGE}/${SANITIZED_BRANCH}/ci-status.yml | awk -F'"' '{print $2}') - - if [[ "${STATUS}" == "PASS" ]]; then STATE=success; else STATE=failed; fi; + - if [ "${STATUS}" == "PASS" ]; then STATE=success; else STATE=failed; fi; - curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=${STATE}&name=${KASM_IMAGE}_x86_64&target_url=https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/x86_64/kasmweb/${KASM_IMAGE}/${SANITIZED_BRANCH}/index.html" parallel: matrix: @@ -560,13 +557,10 @@ link_tests_single_arch_dev: link_tests_multi_arch_dev: stage: linktests - image: - name: amazon/aws-cli - entrypoint: [""] script: - - yum install -y curl + - apk add curl - STATUS=$(curl -sL https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/${ARCH}/kasmweb/${KASM_IMAGE}/${ARCH}-${SANITIZED_BRANCH}/ci-status.yml | awk -F'"' '{print $2}') - - if [[ "${STATUS}" == "PASS" ]]; then STATE=success; else STATE=failed; fi; + - if [ "${STATUS}" == "PASS" ]; then STATE=success; else STATE=failed; fi; - curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=${STATE}&name=${KASM_IMAGE}_${ARCH}&target_url=https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/${ARCH}/kasmweb/${KASM_IMAGE}/${ARCH}-${SANITIZED_BRANCH}/index.html" parallel: matrix: