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

fix indentation in in all dast steps files and sleep in the chainsaw #24

Merged
merged 1 commit into from
Nov 28, 2024
Merged

fix indentation in in all dast steps files and sleep in the chainsaw #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 24 additions & 24 deletions tests/dast/rapid-lca/03-rapidast-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,32 +32,32 @@ spec:
serviceAccount: privileged-sa
serviceAccountName: privileged-sa
containers:
- command:
- sh
- -c
- rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/ -name zap-report.json -exec cat {} \;
image: quay.io/redhatproductsecurity/rapidast:latest
imagePullPolicy: Always
name: rapidast-chart
resources: {}
securityContext:
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /helm/config
name: config-volume
- mountPath: /opt/rapidast/results/
name: results-volume
- command:
- sh
- -c
- rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/lca -name zap-report.json -exec cat {} \;
image: quay.io/redhatproductsecurity/rapidast:latest
imagePullPolicy: Always
name: rapidast-chart
resources: {}
securityContext:
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /helm/config
name: config-volume
- mountPath: /opt/rapidast/results/
name: results-volume
dnsPolicy: ClusterFirst
restartPolicy: Never
schedulerName: default-scheduler
terminationGracePeriodSeconds: 30
volumes:
- configMap:
defaultMode: 420
name: rapidast-configmap
name: config-volume
- name: results-volume
persistentVolumeClaim:
claimName: rapidast-pvc
- configMap:
defaultMode: 420
name: rapidast-configmap
name: config-volume
- name: results-volume
persistentVolumeClaim:
claimName: rapidast-pvc
2 changes: 2 additions & 0 deletions tests/dast/rapid-lca/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
try:
- apply:
file: 03-rapidast-job.yaml
- sleep:
duration: 60s
- assert:
file: 03-assert.yaml
- name: step-04
Expand Down
48 changes: 24 additions & 24 deletions tests/dast/rapid-nrop/03-rapidast-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,32 @@ spec:
serviceAccount: privileged-sa
serviceAccountName: privileged-sa
containers:
- command:
- sh
- -c
- rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/nrop -name zap-report.json -exec cat {} \;
image: quay.io/redhatproductsecurity/rapidast:latest
imagePullPolicy: Always
name: rapidast-chart
resources: {}
securityContext:
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /helm/config
name: config-volume
- mountPath: /opt/rapidast/results/
name: results-volume
- command:
- sh
- -c
- rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/nrop -name zap-report.json -exec cat {} \;
image: quay.io/redhatproductsecurity/rapidast:latest
imagePullPolicy: Always
name: rapidast-chart
resources: {}
securityContext:
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /helm/config
name: config-volume
- mountPath: /opt/rapidast/results/
name: results-volume
dnsPolicy: ClusterFirst
restartPolicy: Never
schedulerName: default-scheduler
terminationGracePeriodSeconds: 30
volumes:
- configMap:
defaultMode: 420
name: rapidast-configmap
name: config-volume
- name: results-volume
persistentVolumeClaim:
claimName: rapidast-pvc
- configMap:
defaultMode: 420
name: rapidast-configmap
name: config-volume
- name: results-volume
persistentVolumeClaim:
claimName: rapidast-pvc
2 changes: 2 additions & 0 deletions tests/dast/rapid-nrop/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
try:
- apply:
file: 03-rapidast-job.yaml
- sleep:
duration: 60s
- assert:
file: 03-assert.yaml
- name: step-04
Expand Down
49 changes: 24 additions & 25 deletions tests/dast/rapid-ptp/03-rapidast-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
Expand Down Expand Up @@ -33,32 +32,32 @@ spec:
serviceAccount: privileged-sa
serviceAccountName: privileged-sa
containers:
- command:
- sh
- -c
- rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/ptp -name zap-report.json -exec cat {} \;
image: quay.io/redhatproductsecurity/rapidast:latest
imagePullPolicy: Always
name: rapidast-chart
resources: {}
securityContext:
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /helm/config
name: config-volume
- mountPath: /opt/rapidast/results/
name: results-volume
- command:
- sh
- -c
- rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/ptp -name zap-report.json -exec cat {} \;
image: quay.io/redhatproductsecurity/rapidast:latest
imagePullPolicy: Always
name: rapidast-chart
resources: {}
securityContext:
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /helm/config
name: config-volume
- mountPath: /opt/rapidast/results/
name: results-volume
dnsPolicy: ClusterFirst
restartPolicy: Never
schedulerName: default-scheduler
terminationGracePeriodSeconds: 30
volumes:
- configMap:
defaultMode: 420
name: rapidast-configmap
name: config-volume
- name: results-volume
persistentVolumeClaim:
claimName: rapidast-pvc
- configMap:
defaultMode: 420
name: rapidast-configmap
name: config-volume
- name: results-volume
persistentVolumeClaim:
claimName: rapidast-pvc
42 changes: 22 additions & 20 deletions tests/dast/rapid-ptp/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,31 @@ spec:
try:
- apply:
file: 03-rapidast-job.yaml
- sleep:
duration: 60s
- assert:
file: 03-assert.yaml
- name: step-04
try:
- name: step-04
try:
- script:
timeout: 6m
content: ./results.sh
finally:
- command:
timeout: 1m
entrypoint: oc
args:
- -n
- rapidast-ptp
- delete
- pod
- rapiterm-ptp
- command:
timeout: 1m
entrypoint: oc
args:
- -n
- rapidast-ptp
- delete
- pod
- --selector=batch.kubernetes.io/job-name=rapidast-job
- command:
timeout: 1m
entrypoint: oc
args:
- -n
- rapidast-ptp
- delete
- pod
- rapiterm-ptp
- command:
timeout: 1m
entrypoint: oc
args:
- -n
- rapidast-ptp
- delete
- pod
- --selector=batch.kubernetes.io/job-name=rapidast-job
48 changes: 24 additions & 24 deletions tests/dast/rapid-talm/03-rapidast-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,32 @@ spec:
serviceAccount: privileged-sa
serviceAccountName: privileged-sa
containers:
- command:
- sh
- -c
- rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/talm -name zap-report.json -exec cat {} \;
image: quay.io/redhatproductsecurity/rapidast:latest
imagePullPolicy: Always
name: rapidast-chart
resources: {}
securityContext:
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /helm/config
name: config-volume
- mountPath: /opt/rapidast/results/
name: results-volume
- command:
- sh
- -c
- rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/talm -name zap-report.json -exec cat {} \;
image: quay.io/redhatproductsecurity/rapidast:latest
imagePullPolicy: Always
name: rapidast-chart
resources: {}
securityContext:
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /helm/config
name: config-volume
- mountPath: /opt/rapidast/results/
name: results-volume
dnsPolicy: ClusterFirst
restartPolicy: Never
schedulerName: default-scheduler
terminationGracePeriodSeconds: 30
volumes:
- configMap:
defaultMode: 420
name: rapidast-configmap
name: config-volume
- name: results-volume
persistentVolumeClaim:
claimName: rapidast-pvc
- configMap:
defaultMode: 420
name: rapidast-configmap
name: config-volume
- name: results-volume
persistentVolumeClaim:
claimName: rapidast-pvc
38 changes: 20 additions & 18 deletions tests/dast/rapid-talm/chainsaw-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
try:
- apply:
file: 03-rapidast-job.yaml
- sleep:
duration: 60s
- assert:
file: 03-assert.yaml
- name: step-04
Expand All @@ -36,21 +38,21 @@ spec:
timeout: 6m
content: ./results.sh
finally:
- command:
timeout: 1m
entrypoint: oc
args:
- -n
- rapidast-talm
- delete
- pod
- rapiterm-talm
- command:
timeout: 1m
entrypoint: oc
args:
- -n
- rapidast-talm
- delete
- pod
- --selector=batch.kubernetes.io/job-name=rapidast-job
- command:
timeout: 1m
entrypoint: oc
args:
- -n
- rapidast-talm
- delete
- pod
- rapiterm-talm
- command:
timeout: 1m
entrypoint: oc
args:
- -n
- rapidast-talm
- delete
- pod
- --selector=batch.kubernetes.io/job-name=rapidast-job