fix inditation in in all dast steps files and sleep in the chainsaw

openshift-kni · Nov 27, 2024 · 0a077da · 0a077da
1 parent 05e38e8
commit 0a077da
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 135 deletions.
diff --git a/tests/dast/rapid-lca/03-rapidast-job.yaml b/tests/dast/rapid-lca/03-rapidast-job.yaml
@@ -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
diff --git a/tests/dast/rapid-lca/chainsaw-test.yaml b/tests/dast/rapid-lca/chainsaw-test.yaml
@@ -28,6 +28,8 @@ spec:
     try:
     - apply:
         file: 03-rapidast-job.yaml
+    - sleep:
+        duration: 60s
     - assert:
         file: 03-assert.yaml
   - name: step-04

diff --git a/tests/dast/rapid-nrop/03-rapidast-job.yaml b/tests/dast/rapid-nrop/03-rapidast-job.yaml
@@ -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
diff --git a/tests/dast/rapid-nrop/chainsaw-test.yaml b/tests/dast/rapid-nrop/chainsaw-test.yaml
@@ -28,6 +28,8 @@ spec:
     try:
     - apply:
         file: 03-rapidast-job.yaml
+    - sleep:
+        duration: 60s
     - assert:
         file: 03-assert.yaml
   - name: step-04

diff --git a/tests/dast/rapid-ptp/03-rapidast-job.yaml b/tests/dast/rapid-ptp/03-rapidast-job.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -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
diff --git a/tests/dast/rapid-ptp/chainsaw-test.yaml b/tests/dast/rapid-ptp/chainsaw-test.yaml
@@ -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
diff --git a/tests/dast/rapid-talm/03-rapidast-job.yaml b/tests/dast/rapid-talm/03-rapidast-job.yaml
@@ -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
diff --git a/tests/dast/rapid-talm/chainsaw-test.yaml b/tests/dast/rapid-talm/chainsaw-test.yaml
@@ -28,6 +28,8 @@ spec:
     try:
     - apply:
         file: 03-rapidast-job.yaml
+    - sleep:
+        duration: 60s
     - assert:
         file: 03-assert.yaml
   - name: step-04
@@ -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