Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test(e2e): debug e2e-tests, don't merge! #82

Closed
wants to merge 8 commits into from
Closed

test(e2e): debug e2e-tests, don't merge! #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d0bc588
add collector for flacky scan job
bendikp Jan 17, 2023
145cea1
add debug to the trivy server
bendikp Jan 17, 2023
a635176
more debug collectors
bendikp Jan 17, 2023
b8646e6
only run flacky test
bendikp Jan 17, 2023
fd9e98e
add trivy client debug
bendikp Jan 18, 2023
393bc28
remove quiet
bendikp Jan 18, 2023
ad8253c
disable harden runner for e2e-tests
erikgb Jan 19, 2023
d83104a
log all from scan job
erikgb Jan 19, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ jobs:
needs: test
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
# - name: Harden Runner
# uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
# with:
# egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
- uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 # v2.4.0
Expand Down
2 changes: 1 addition & 1 deletion config/trivy-server/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ configMapGenerator:
literals:
- LISTEN=0.0.0.0:4954
- CACHE_DIR=/home/scanner/.cache/trivy
- DEBUG=false
- DEBUG=true
- SKIP_UPDATE=false
- DB_REPOSITORY=ghcr.io/aquasecurity/trivy-db
2 changes: 1 addition & 1 deletion internal/controller/stas/testdata/scan-job/expected-scan-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
value: /tmp
- name: TRIVY_SERVER
value: http://trivy.image-scanner.svc.cluster.local
- name: TRIVY_QUIET
- name: TRIVY_DEBUG
value: "true"
- name: TRIVY_FORMAT
value: template
Expand Down
2 changes: 1 addition & 1 deletion internal/trivy/scan_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func (f *filesystemScanJobBuilder) container(spec stasv1alpha1.ContainerImageSca
{Name: "TRIVY_SECURITY_CHECKS", Value: "vuln"},
{Name: "TRIVY_CACHE_DIR", Value: TempVolumeMountPath},
{Name: "TRIVY_SERVER", Value: f.TrivyServer},
{Name: "TRIVY_QUIET", Value: "true"},
{Name: "TRIVY_DEBUG", Value: "true"},
{Name: "TRIVY_FORMAT", Value: "template"},
{Name: "TRIVY_TEMPLATE", Value: reportTemplate},
{Name: "TRIVY_TIMEOUT", Value: ScanJobTimeout.String()},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-config/kuttl-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
name: default
testDirs:
- test/e2e/scenario
- test/e2e/workload-scan
# - test/e2e/workload-scan
timeout: 240
reportFormat: xml
8 changes: 8 additions & 0 deletions test/e2e/scenario/vulnerability-overflow/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ collectors:
command: df -h
- type: events
namespace: image-scanner-jobs
- type: command
command: kubectl get pods -n image-scanner-jobs
- type: command
command: kubectl get jobs -n image-scanner-jobs
- type: pod
namespace: image-scanner-jobs
selector: workload.statnett.no/name=vuln-app
bendikp marked this conversation as resolved.
Show resolved Hide resolved
tail: -1
- type: pod
namespace: image-scanner
pod: trivy-0
Expand Down