Skip to content

Commit

Permalink
Merge pull request #81 from anchore/remove-acceptance
Browse files Browse the repository at this point in the history
chore: remove redundant acceptance tests
  • Loading branch information
bradleyjones authored Apr 21, 2023
2 parents 252c2b7 + 890187a commit 7a4585f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 111 deletions.
73 changes: 0 additions & 73 deletions .github/workflows/acceptance-test.yaml

This file was deleted.

32 changes: 1 addition & 31 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ jobs:
git fetch origin main
git merge-base --is-ancestor ${GITHUB_REF##*/} origin/main && echo "${GITHUB_REF##*/} is a commit on main!"
- name: Build snapshot artifacts
uses: fountainhead/[email protected]
id: snapshot
with:
token: ${{ secrets.GITHUB_TOKEN }}
# This check name is defined as the github actions job name (in .github/workflows/acceptance-test.yaml)
checkName: "Build-Snapshot-Artifacts"
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Check static analysis
uses: fountainhead/[email protected]
id: static-analysis
Expand All @@ -52,32 +43,11 @@ jobs:
checkName: "Tests (1.19.x, ubuntu-latest)"
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Check acceptance test results (helm v1.13.12)
uses: fountainhead/[email protected]
id: acceptance-helm-1-13-12
with:
token: ${{ secrets.GITHUB_TOKEN }}
# This check name is defined as the github action job name + the kubernetes version (see below) (in .github/workflows/acceptance-test.yaml)
checkName: "Acceptance-Helm (v1.13.12)"
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Check acceptance test results (helm v1.18.0)
uses: fountainhead/[email protected]
id: acceptance-helm-1-18-0
with:
token: ${{ secrets.GITHUB_TOKEN }}
# This check name is defined as the github action job name + the kubernetes version (see below) (in .github/workflows/acceptance-test.yaml)
checkName: "Acceptance-Helm (v1.18.0)"
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Quality gate
if: steps.static-analysis.outputs.conclusion != 'success' || steps.tests-unit-int.outputs.conclusion != 'success' || steps.snapshot.outputs.conclusion != 'success' || steps.acceptance-helm-1-13-12.outputs.conclusion != 'success' || steps.acceptance-helm-1-18-0.outputs.conclusion != 'success'
if: steps.static-analysis.outputs.conclusion != 'success' || steps.tests-unit-int.outputs.conclusion != 'success'
run: |
echo "Static-Analysis Status : ${{ steps.static-analysis.outputs.conclusion }}"
echo "Unit/Integration Status : ${{ steps.tests-unit-int.outputs.conclusion }}"
echo "Build Snapshot Artifacts Status: ${{ steps.snapshot.outputs.conclusion }}"
echo "Acceptance Test (Helm v1.13.12) Status: ${{ steps.acceptance-helm-1-13-12.outputs.conclusion }}"
echo "Acceptance Test (Helm v1.18.0) Status: ${{ steps.acceptance-helm-1-18-0.outputs.conclusion }}"
false
release:
Expand Down
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ COVER_REPORT = $(RESULTSDIR)/cover.report
COVER_TOTAL = $(RESULTSDIR)/cover.total
LICENSES_REPORT = $(RESULTSDIR)/licenses.json
LINTCMD = $(TEMPDIR)/golangci-lint run --config .golangci.yaml
ACC_DIR = ./test/acceptance
BOLD := $(shell tput -T linux bold)
PURPLE := $(shell tput -T linux setaf 5)
GREEN := $(shell tput -T linux setaf 2)
Expand Down Expand Up @@ -60,7 +59,7 @@ all: clean static-analysis unit ## Run all checks (linting, license check, unit
@printf '$(SUCCESS)All checks pass!$(RESET)\n'

.PHONY: test
test: unit integration acceptance-helm ## Run all tests (unit, integration, acceptance-helm )
test: unit integration ## Run all tests (unit, integration)

help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "$(BOLD)$(CYAN)%-25s$(RESET)%s\n", $$1, $$2}'
Expand Down Expand Up @@ -135,11 +134,6 @@ integration: ## Run integration tests
$(call title,Running integration tests)
./test/integration/test-integration.sh $(CLUSTER_NAME)

.PHONY: acceptance-helm
acceptance-helm: ## Verify that the latest helm chart for anchore-k8s-inventory works w/ the latest code (depends on anchore/k8s-inventory:latest image existing)
$(call title,Running acceptance test: Helm)
$(ACC_DIR)/helm-chart.sh \

.PHONY: check-pipeline
check-pipeline: ## Run local CircleCI pipeline locally (sanity check)
$(call title,Check pipeline)
Expand Down

0 comments on commit 7a4585f

Please sign in to comment.