From ff309182ea2531c6c23526999524650487c04905 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 3 Jun 2021 09:07:55 +0200 Subject: [PATCH] Drop kcov/codecov for now, use upstream bats --- .drone.yml | 17 +---------------- README.md | 1 - makefile | 17 ++--------------- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1acdd8a..9322016 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,24 +14,10 @@ steps: - flake8 --max-line-length 100 bin/app-json.py - name: run unit tests - image: decentral1se/docker-dind-bats-kcov + image: bats/bats commands: - bats tests - - name: collect code coverage - failure: ignore # until we fix this - image: decentral1se/docker-dind-bats-kcov - commands: - - kcov . bats tests || true - - - name: send code coverage report to codecov - failure: ignore # until we fix this - image: plugins/codecov - settings: - token: - from_secret: codecov_token - required: true - - name: notify rocket chat image: plugins/slack settings: @@ -43,7 +29,6 @@ steps: when: status: - failure - trigger: branch: - main diff --git a/README.md b/README.md index 182637c..6b05156 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # abra [![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/abra/status.svg)](https://drone.autonomic.zone/coop-cloud/abra) -[![codecov](https://codecov.io/gh/Autonomic-Cooperative/abra/branch/main/graph/badge.svg?token=aX3I5NMRsj)](undefined) > https://coopcloud.tech diff --git a/makefile b/makefile index 79d35a2..786784a 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,4 @@ -.PHONY: test shellcheck docopt kcov codecov release-installer +.PHONY: test shellcheck docopt release-installer test: @sudo DOCKER_CONTEXT=default docker run \ @@ -7,7 +7,7 @@ test: -d \ --name=abra-test-dind \ -e DOCKER_TLS_CERTDIR="" \ - decentral1se/docker-dind-bats-kcov + bats/bats \ @DOCKER_CONTEXT=default sudo docker exec \ -it \ abra-test-dind \ @@ -32,19 +32,6 @@ docopt: fi .venv/bin/docopt.sh abra -kcov: - @docker run \ - -it \ - --rm \ - -v $$(pwd):/workdir \ - kcov/kcov:latest \ - sh -c "kcov /workdir/coverage /workdir/abra || true" - -codecov: SHELL:=/bin/bash -codecov: - @bash <(curl -s https://codecov.io/bash) \ - -s coverage -t $$(pass show hosts/swarm.autonomic.zone/drone/codecov/token) - release-installer: @DOCKER_CONTEXT=swarm.autonomic.zone \ docker stack rm abra-installer-script && \