Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ jobs:
path: ./${{ matrix.sdk }}/nodejs/${{ matrix.sdk }}.tar
retention-days: 1

# ---- New Makefile based CI Pipeline steps ----
# ---- Test | Scanners ----

Integration-test-scanner:
name: "Make Scanners"
test-scanners:
name: "Test | Scanner ${{ matrix.unit }}"
needs:
- sdk
- operator
Expand Down Expand Up @@ -423,10 +423,10 @@ jobs:
echo "Operator Startup Logs"
kubectl -n securecodebox-system logs deployment/securecodebox-controller-manager

# ---- Integration Tests ----
# ---- Test | Hooks ----

Integration-tests-hooks:
name: Integration Tests Hook ${{ matrix.hook }} | k8s ${{ matrix.k8sVersion }}
test-hooks:
name: Test | Hook ${{ matrix.hook }} | k8s ${{ matrix.k8sVersion }}
needs:
- operator
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -561,6 +561,12 @@ jobs:
working-directory: ./tests/integration
run: npm ci

# ---- Unit-Test ----

- name: "Run Unit Tests"
working-directory: ./hooks/${{ matrix.hook }}
run: make unit-tests

# ---- Integration-Test ----

- name: Deploy ${{ matrix.hook }}
Expand Down
2 changes: 1 addition & 1 deletion common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ install-deps-js:

unit-test-js: install-deps-js
@echo ".: 🧪 Starting unit-tests for '$(name)' $(module) with 'jest@$(JEST_VERSION)'."
npx --yes --package jest@$(JEST_VERSION) jest --ci --colors --coverage --passWithNoTests ${name}/${module}/
npx --yes --package jest@$(JEST_VERSION) jest --ci --colors --coverage --passWithNoTests ${name}/${module}/ --testPathIgnorePatterns /integration-tests/

install-deps-py:
@echo ".: ⚙️ Installing all $(module) specific python dependencies."
Expand Down