diff --git a/.github/workflows/lib-e2e.yaml b/.github/workflows/lib-e2e.yaml index 7c6a4dffb..9752373db 100644 --- a/.github/workflows/lib-e2e.yaml +++ b/.github/workflows/lib-e2e.yaml @@ -28,19 +28,12 @@ jobs: - accel-config-demo - intel-deviceplugin-operator - name: e2e-qat-gnrd - targetjob: e2e-qat FOCUS="Mode:dpdk.*Resource:(cy|dc)" SKIP=App:crypto-perf + targetjob: e2e-qat FOCUS="Mode:dpdk.*Resource:(cy|dc)" SKIP="App:(crypto-perf|compress-perf)" runner: simics-gnrd images: - intel-qat-plugin - intel-qat-initcontainer - openssl-qat-engine - - name: e2e-qat - targetjob: e2e-qat FOCUS=Resource:generic - runner: qat - images: - - intel-qat-plugin - - intel-qat-initcontainer - - crypto-perf - name: e2e-fpga runner: fpga images: @@ -49,6 +42,7 @@ jobs: - intel-fpga-admissionwebhook - opae-nlb-demo - name: e2e-spr + targetjob: e2e-spr SKIP="App:compress-perf" runner: spr images: - intel-qat-plugin diff --git a/.trivyignore.yaml b/.trivyignore.yaml index 52f5af693..7433e0d66 100644 --- a/.trivyignore.yaml +++ b/.trivyignore.yaml @@ -12,7 +12,6 @@ misconfigurations: paths: - dlb_plugin/overlays/dlb_initcontainer/dlb_initcontainer.yaml - dsa_plugin/overlays/dsa_initcontainer/dsa_initcontainer.yaml - - qat_dpdk_app/patches/crypto-perf/env_replace_testcmd.yaml - iaa_plugin/overlays/iaa_initcontainer/iaa_initcontainer.yaml - qat_plugin/base/intel-qat-kernel-plugin.yaml - qat_plugin/overlays/qat_initcontainer/qat_initcontainer.yaml @@ -46,10 +45,7 @@ misconfigurations: - xpumanager_sidecar/kustom/kustom_xpumanager.yaml - operator/default/manager_auth_proxy_patch.yaml - operator/default/manager_webhook_patch.yaml - - qat_dpdk_app/patches/compress-perf/env_replace_testcmd.yaml - - qat_dpdk_app/patches/compress-perf/volume_add_configmap.yaml - qat_plugin/overlays/debug/add-args.yaml - qat_plugin/overlays/e2e/add-args.yaml - qat_plugin/overlays/debug/add-args.yaml - - qat_dpdk_app/patches/crypto-perf/env_replace_testcmd.yaml - sgx_admissionwebhook/base/manager_webhook_patch.yaml diff --git a/DEVEL.md b/DEVEL.md index 3c21b14f5..f91b01fe4 100644 --- a/DEVEL.md +++ b/DEVEL.md @@ -217,9 +217,8 @@ go test -v ./test/e2e/... -args -ginkgo.focus -ginkgo.skip ` for a container requesting QAT devices. +- You may need to add hugepage request and limit. -For a DPDK-based workload, you may need to add hugepage request and limit. - -```bash -$ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/qat_dpdk_app/base/ -$ kubectl get pods - NAME READY STATUS RESTARTS AGE - qat-dpdk 1/1 Running 0 27m - intel-qat-plugin-5zgvb 1/1 Running 0 3h - -``` +- The cluster must enable [Kubernetes CPU manager's](https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/) `static` policy. > **Note**: If the `igb_uio` VF driver is used with the QAT device plugin, > the workload be deployed with `SYS_ADMIN` capabilities added. -#### Manual Test Run - -Manually execute the `dpdk-test-crypto-perf` application to review the logs: +#### Deploy the pod ```bash -$ kubectl exec -it qat-dpdk bash - -$ dpdk-test-crypto-perf -l 6-7 -w $QAT1 \ --d /usr/lib64/librte_mempool_ring.so.1.1 \ --d /usr/lib64/librte_pmd_qat.so.1.1 -- \ ---ptest throughput --devtype crypto_qat \ ---optype cipher-only --cipher-algo aes-cbc --cipher-op encrypt \ ---cipher-key-sz 16 --total-ops 10000000 --burst-sz 32 --buffer-sz 64 +$ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/qat_dpdk_app/ +$ kubectl get pods + NAME READY STATUS RESTARTS AGE + qat-dpdk-test-crypto-perf 1/1 Running 0 27m + qat-dpdk-test-compress-perf 1/1 Running 0 27m + intel-qat-plugin-5zgvb 1/1 Running 0 3h ``` -> **Note**: Adapt the `.so` versions to what the DPDK version in the container provides. +Both pods for [crypto-perf](../..//deployments/qat_dpdk_app/crypto-perf) and [compress-perf](../../deployments/qat_dpdk_app/compress-perf) are generated by default using `kustomize`. -#### Automated Test Run - -It is also possible to deploy and run `crypto-perf` using the following -`kustomize` overlays: +It is also possible to deploy and run `crypto-perf` or `compress-perf` only. ```bash -$ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/qat_dpdk_app/test-crypto1 -$ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/qat_dpdk_app/test-compress1 -$ kubectl logs qat-dpdk-test-crypto-perf-tc1 -$ kubectl logs qat-dpdk-test-compress-perf-tc1 +$ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/qat_dpdk_app/crypto-perf +$ kubectl logs qat-dpdk-test-crypto-perf ``` -> **Note**: for `test-crypto1` and `test-compress1` to work, the cluster must enable -[Kubernetes CPU manager's](https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/) `static` policy. +```bash +$ kubectl apply -k https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/qat_dpdk_app/compress-perf +$ kubectl logs qat-dpdk-test-compress-perf +``` ### OpenSSL QAT Demo diff --git a/demo/openssl-qat-engine/Dockerfile b/demo/openssl-qat-engine/Dockerfile index ac56b9f5c..6cda0a4c3 100644 --- a/demo/openssl-qat-engine/Dockerfile +++ b/demo/openssl-qat-engine/Dockerfile @@ -1,4 +1,4 @@ FROM ubuntu:24.04 RUN apt update && \ - apt install --no-install-recommends -y qatengine qatlib-examples qatzip openssl \ No newline at end of file + apt install --no-install-recommends -y qatengine qatlib-examples qatzip openssl diff --git a/demo/screencast-qat-dpdk.sh b/demo/screencast-qat-dpdk.sh index 956622412..6df7504c5 100644 --- a/demo/screencast-qat-dpdk.sh +++ b/demo/screencast-qat-dpdk.sh @@ -79,11 +79,11 @@ screen5() { clear - out "7. View pod specification file for pod requesting QAT Virtual Functions:" - command "kubectl apply --dry-run -o yaml -k ../deployments/qat_dpdk_app/base" + out "7. View pod specification file for pod requesting QAT Virtual Functions (crypto):" + command "kubectl apply --dry-run -o yaml -k ../deployments/qat_dpdk_app/crypto-perf" sleep 5 - out "8. Create Pod requesting QAT Virtual Functions:" - command "kubectl apply -k ../deployments/qat_dpdk_app/base" + out "8. Create Pod requesting QAT Virtual Functions (crypto):" + command "kubectl apply -k ../deployments/qat_dpdk_app/crypto-perf" sleep 2 command "kubectl get pods" sleep 2 @@ -91,10 +91,13 @@ screen6() { clear - out "9. Get a shell to the running container and run a DPDK application using QAT device" - out "* \"export\": Lists environment variables - note QAT0, QAT1, QAT2... etc" - out "* \"./dpdk-test-crypto-perf -l 6-7 -w \$QAT0 -- --ptest throughput --devtype crypto_qat --optype cipher-only --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --total-ops 10000000 --burst-sz 32 --buffer-sz 64\" : Manually executes the dpdk-test-crypto-perf application to review the logs" - command "kubectl exec -it qat-dpdk bash" + out "9. View pod specification file for pod requesting QAT Virtual Functions (compress):" + command "kubectl apply --dry-run -o yaml -k ../deployments/qat_dpdk_app/compress-perf" + sleep 5 + out "10. Create Pod requesting QAT Virtual Functions (compress):" + command "kubectl apply -k ../deployments/qat_dpdk_app/compress-perf" + sleep 2 + command "kubectl get pods" sleep 10 } if [ "$1" == 'play' ] ; then diff --git a/deployments/qat_dpdk_app/base/kustomization.yaml b/deployments/qat_dpdk_app/base/kustomization.yaml deleted file mode 100644 index 2bd9e9b57..000000000 --- a/deployments/qat_dpdk_app/base/kustomization.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resources: -- crypto-perf-dpdk-pod-requesting-qat.yaml diff --git a/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml b/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml new file mode 100644 index 000000000..f14a26bbc --- /dev/null +++ b/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml @@ -0,0 +1,49 @@ +kind: Pod +apiVersion: v1 +metadata: + name: qat-dpdk-test-compress-perf +spec: + containers: + - name: compress-perf + image: intel/crypto-perf:devel + imagePullPolicy: IfNotPresent + env: + - name: TESTCMD + value: "compress" + - name: PTEST + value: "--driver-name compress_qat --input-file /var/data/file.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed" + volumeMounts: + - mountPath: /dev/hugepages + name: hugepage + - mountPath: /var/run/dpdk + name: dpdk-runtime + - mountPath: /var/data/ + name: testfile + resources: + requests: + cpu: "3" + memory: "128Mi" + qat.intel.com/dc: '4' + hugepages-2Mi: "128Mi" + limits: + cpu: "3" + memory: "128Mi" + qat.intel.com/dc: '4' + hugepages-2Mi: "128Mi" + securityContext: + readOnlyRootFilesystem: true + allowPrivilegeEscalation: false + capabilities: + add: + ["IPC_LOCK"] + restartPolicy: Never + volumes: + - name: dpdk-runtime + emptyDir: + medium: Memory + - name: hugepage + emptyDir: + medium: HugePages + - name: testfile + configMap: + name: test-data diff --git a/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-generic.yaml b/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-generic.yaml new file mode 100644 index 000000000..f14a26bbc --- /dev/null +++ b/deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-generic.yaml @@ -0,0 +1,49 @@ +kind: Pod +apiVersion: v1 +metadata: + name: qat-dpdk-test-compress-perf +spec: + containers: + - name: compress-perf + image: intel/crypto-perf:devel + imagePullPolicy: IfNotPresent + env: + - name: TESTCMD + value: "compress" + - name: PTEST + value: "--driver-name compress_qat --input-file /var/data/file.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed" + volumeMounts: + - mountPath: /dev/hugepages + name: hugepage + - mountPath: /var/run/dpdk + name: dpdk-runtime + - mountPath: /var/data/ + name: testfile + resources: + requests: + cpu: "3" + memory: "128Mi" + qat.intel.com/dc: '4' + hugepages-2Mi: "128Mi" + limits: + cpu: "3" + memory: "128Mi" + qat.intel.com/dc: '4' + hugepages-2Mi: "128Mi" + securityContext: + readOnlyRootFilesystem: true + allowPrivilegeEscalation: false + capabilities: + add: + ["IPC_LOCK"] + restartPolicy: Never + volumes: + - name: dpdk-runtime + emptyDir: + medium: Memory + - name: hugepage + emptyDir: + medium: HugePages + - name: testfile + configMap: + name: test-data diff --git a/deployments/qat_dpdk_app/patches/compress-perf/file.txt b/deployments/qat_dpdk_app/compress-perf/file.txt similarity index 100% rename from deployments/qat_dpdk_app/patches/compress-perf/file.txt rename to deployments/qat_dpdk_app/compress-perf/file.txt diff --git a/deployments/qat_dpdk_app/compress-perf/kustomization.yaml b/deployments/qat_dpdk_app/compress-perf/kustomization.yaml new file mode 100644 index 000000000..f78d323ee --- /dev/null +++ b/deployments/qat_dpdk_app/compress-perf/kustomization.yaml @@ -0,0 +1,7 @@ +configMapGenerator: +- files: + - file.txt + name: test-data + +resources: +- compress-perf-dpdk-pod-requesting-qat-dc.yaml diff --git a/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml b/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml new file mode 100644 index 000000000..df77c1ac3 --- /dev/null +++ b/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml @@ -0,0 +1,44 @@ +kind: Pod +apiVersion: v1 +metadata: + name: qat-dpdk-test-crypto-perf +spec: + containers: + - name: crypto-perf + image: intel/crypto-perf:devel + imagePullPolicy: IfNotPresent + env: + - name: TESTCMD + value: "crypto" + - name: PTEST + value: "--ptest throughput --devtype crypto_qat --optype cipher-only --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --total-ops 10000000 --burst-sz 32 --buffer-sz 64" + volumeMounts: + - mountPath: /dev/hugepages + name: hugepage + - mountPath: /var/run/dpdk + name: dpdk-runtime + resources: + requests: + cpu: "3" + memory: "128Mi" + qat.intel.com/cy: '4' + hugepages-2Mi: "128Mi" + limits: + cpu: "3" + memory: "128Mi" + qat.intel.com/cy: '4' + hugepages-2Mi: "128Mi" + securityContext: + readOnlyRootFilesystem: true + allowPrivilegeEscalation: false + capabilities: + add: + ["IPC_LOCK"] + restartPolicy: Never + volumes: + - name: dpdk-runtime + emptyDir: + medium: Memory + - name: hugepage + emptyDir: + medium: HugePages diff --git a/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml b/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-generic.yaml similarity index 74% rename from deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml rename to deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-generic.yaml index 55b72894c..d5fd63f35 100644 --- a/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml +++ b/deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-generic.yaml @@ -1,14 +1,17 @@ kind: Pod apiVersion: v1 metadata: - name: qat-dpdk + name: qat-dpdk-test-crypto-perf spec: containers: - name: crypto-perf image: intel/crypto-perf:devel imagePullPolicy: IfNotPresent - command: [ "/bin/bash", "-c", "--" ] - args: [ "while true; do sleep 300000; done;" ] + env: + - name: TESTCMD + value: "crypto" + - name: PTEST + value: "--ptest throughput --devtype crypto_qat --optype cipher-only --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --total-ops 10000000 --burst-sz 32 --buffer-sz 64" volumeMounts: - mountPath: /dev/hugepages name: hugepage diff --git a/deployments/qat_dpdk_app/crypto-perf/kustomization.yaml b/deployments/qat_dpdk_app/crypto-perf/kustomization.yaml new file mode 100644 index 000000000..f820e8ee3 --- /dev/null +++ b/deployments/qat_dpdk_app/crypto-perf/kustomization.yaml @@ -0,0 +1,2 @@ +resources: +- crypto-perf-dpdk-pod-requesting-qat-cy.yaml diff --git a/deployments/qat_dpdk_app/kustomization.yaml b/deployments/qat_dpdk_app/kustomization.yaml index 197c7292e..59f8eea84 100644 --- a/deployments/qat_dpdk_app/kustomization.yaml +++ b/deployments/qat_dpdk_app/kustomization.yaml @@ -1,2 +1,3 @@ resources: - - base + - compress-perf + - crypto-perf \ No newline at end of file diff --git a/deployments/qat_dpdk_app/patches/compress-perf/env_replace_testcmd.yaml b/deployments/qat_dpdk_app/patches/compress-perf/env_replace_testcmd.yaml deleted file mode 100644 index 1b537bde6..000000000 --- a/deployments/qat_dpdk_app/patches/compress-perf/env_replace_testcmd.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: qat-dpdk -spec: - containers: - - name: crypto-perf - env: - - name: TESTCMD - value: "compress" diff --git a/deployments/qat_dpdk_app/patches/compress-perf/kustomization.yaml b/deployments/qat_dpdk_app/patches/compress-perf/kustomization.yaml deleted file mode 100644 index 65f3cbf01..000000000 --- a/deployments/qat_dpdk_app/patches/compress-perf/kustomization.yaml +++ /dev/null @@ -1,12 +0,0 @@ -nameSuffix: -compress-perf -resources: -- ../dpdk-test/ -configMapGenerator: -- files: - - file.txt - name: test-data -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: volume_add_configmap.yaml -- path: env_replace_testcmd.yaml diff --git a/deployments/qat_dpdk_app/patches/compress-perf/volume_add_configmap.yaml b/deployments/qat_dpdk_app/patches/compress-perf/volume_add_configmap.yaml deleted file mode 100644 index 66859f7f5..000000000 --- a/deployments/qat_dpdk_app/patches/compress-perf/volume_add_configmap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: qat-dpdk -spec: - containers: - - name: crypto-perf - volumeMounts: - - name: testfile - mountPath: /var/data/ - volumes: - - name: testfile - configMap: - name: test-data diff --git a/deployments/qat_dpdk_app/patches/crypto-perf/env_replace_testcmd.yaml b/deployments/qat_dpdk_app/patches/crypto-perf/env_replace_testcmd.yaml deleted file mode 100644 index 9bf72b1ef..000000000 --- a/deployments/qat_dpdk_app/patches/crypto-perf/env_replace_testcmd.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: qat-dpdk-test -spec: - containers: - - name: crypto-perf - env: - - name: TESTCMD - value: "crypto" diff --git a/deployments/qat_dpdk_app/patches/crypto-perf/kustomization.yaml b/deployments/qat_dpdk_app/patches/crypto-perf/kustomization.yaml deleted file mode 100644 index 9cea1553d..000000000 --- a/deployments/qat_dpdk_app/patches/crypto-perf/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nameSuffix: -crypto-perf -resources: -- ../dpdk-test/ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: test.json - target: - kind: Pod - name: qat-dpdk - version: v1 diff --git a/deployments/qat_dpdk_app/patches/crypto-perf/test.json b/deployments/qat_dpdk_app/patches/crypto-perf/test.json deleted file mode 100644 index 9655134c7..000000000 --- a/deployments/qat_dpdk_app/patches/crypto-perf/test.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - {"op": "replace", "path": "/spec/containers/0/env/0/value", "value": "crypto"} -] diff --git a/deployments/qat_dpdk_app/patches/dpdk-test/containers_patch_command_args.json b/deployments/qat_dpdk_app/patches/dpdk-test/containers_patch_command_args.json deleted file mode 100644 index 47daa87b5..000000000 --- a/deployments/qat_dpdk_app/patches/dpdk-test/containers_patch_command_args.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - {"op": "remove", "path": "/spec/containers/0/args"}, - {"op": "replace", "path": "/spec/containers/0/command", "value": ["/usr/bin/run-dpdk-test"]}, - {"op": "add", "path": "/spec/containers/0/env", "value": [{"name": "TESTCMD", "value": "dummy"}, {"name": "PTEST", "value": "dummy"}]} -] diff --git a/deployments/qat_dpdk_app/patches/dpdk-test/kustomization.yaml b/deployments/qat_dpdk_app/patches/dpdk-test/kustomization.yaml deleted file mode 100644 index b868cdea3..000000000 --- a/deployments/qat_dpdk_app/patches/dpdk-test/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nameSuffix: -test -resources: -- ../../base/ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: containers_patch_command_args.json - target: - kind: Pod - name: qat-dpdk - version: v1 diff --git a/deployments/qat_dpdk_app/test-compress1/kustomization.yaml b/deployments/qat_dpdk_app/test-compress1/kustomization.yaml deleted file mode 100644 index 689c1fd82..000000000 --- a/deployments/qat_dpdk_app/test-compress1/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nameSuffix: -tc1 -resources: -- ../patches/compress-perf -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: tc1.json - target: - kind: Pod - name: qat-dpdk - version: v1 diff --git a/deployments/qat_dpdk_app/test-compress1/tc1.json b/deployments/qat_dpdk_app/test-compress1/tc1.json deleted file mode 100644 index 97c844b31..000000000 --- a/deployments/qat_dpdk_app/test-compress1/tc1.json +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/containers/0/env/1/value - value: "--driver-name compress_qat --input-file /var/data/file.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed" diff --git a/deployments/qat_dpdk_app/test-crypto1-gen4/kustomization.yaml b/deployments/qat_dpdk_app/test-crypto1-gen4/kustomization.yaml deleted file mode 100644 index b39c90b19..000000000 --- a/deployments/qat_dpdk_app/test-crypto1-gen4/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -nameSuffix: -gen4 -resources: -- ../test-crypto1 -patches: -- target: - version: v1 - kind: Pod - name: qat-dpdk - path: tc1-gen4.yaml diff --git a/deployments/qat_dpdk_app/test-crypto1-gen4/tc1-gen4.yaml b/deployments/qat_dpdk_app/test-crypto1-gen4/tc1-gen4.yaml deleted file mode 100644 index 55f03f219..000000000 --- a/deployments/qat_dpdk_app/test-crypto1-gen4/tc1-gen4.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- op: replace - path: /spec/containers/0/resources - value: - requests: - cpu: "3" - memory: "128Mi" - qat.intel.com/cy: '4' - hugepages-2Mi: "128Mi" - limits: - cpu: "3" - memory: "128Mi" - qat.intel.com/cy: '4' - hugepages-2Mi: "128Mi" diff --git a/deployments/qat_dpdk_app/test-crypto1/kustomization.yaml b/deployments/qat_dpdk_app/test-crypto1/kustomization.yaml deleted file mode 100644 index 58546ab67..000000000 --- a/deployments/qat_dpdk_app/test-crypto1/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nameSuffix: -tc1 -resources: -- ../patches/crypto-perf -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: tc1.json - target: - kind: Pod - name: qat-dpdk - version: v1 diff --git a/deployments/qat_dpdk_app/test-crypto1/tc1.json b/deployments/qat_dpdk_app/test-crypto1/tc1.json deleted file mode 100644 index 927003624..000000000 --- a/deployments/qat_dpdk_app/test-crypto1/tc1.json +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/containers/0/env/1/value - value: "--ptest throughput --devtype crypto_qat --optype cipher-only --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --total-ops 10000000 --burst-sz 32 --buffer-sz 64" diff --git a/test/e2e/qat/qatplugin_dpdk.go b/test/e2e/qat/qatplugin_dpdk.go index 58fe3dfb1..0852dc1e6 100644 --- a/test/e2e/qat/qatplugin_dpdk.go +++ b/test/e2e/qat/qatplugin_dpdk.go @@ -36,10 +36,8 @@ import ( const ( qatPluginKustomizationYaml = "deployments/qat_plugin/overlays/e2e/kustomization.yaml" - compressTestYaml = "deployments/qat_dpdk_app/test-compress1/kustomization.yaml" - cryptoTestYaml = "deployments/qat_dpdk_app/test-crypto1/kustomization.yaml" - cryptoTestGen4Yaml = "deployments/qat_dpdk_app/test-crypto1-gen4/kustomization.yaml" - demoPodContainerName = "crypto-perf" + cryptoTestYaml = "deployments/qat_dpdk_app/crypto-perf/crypto-perf-dpdk-pod-requesting-qat-cy.yaml" + compressTestYaml = "deployments/qat_dpdk_app/compress-perf/compress-perf-dpdk-pod-requesting-qat-dc.yaml" ) const ( @@ -66,19 +64,14 @@ func describeQatDpdkPlugin() { framework.Failf("unable to locate %q: %v", qatPluginKustomizationYaml, errFailedToLocateRepoFile) } - compressTestYamlPath, errFailedToLocateRepoFile := utils.LocateRepoFile(compressTestYaml) - if errFailedToLocateRepoFile != nil { - framework.Failf("unable to locate %q: %v", compressTestYaml, errFailedToLocateRepoFile) - } - cryptoTestYamlPath, errFailedToLocateRepoFile := utils.LocateRepoFile(cryptoTestYaml) if errFailedToLocateRepoFile != nil { framework.Failf("unable to locate %q: %v", cryptoTestYaml, errFailedToLocateRepoFile) } - cryptoTestGen4YamlPath, errFailedToLocateRepoFile := utils.LocateRepoFile(cryptoTestGen4Yaml) + compressTestYamlPath, errFailedToLocateRepoFile := utils.LocateRepoFile(compressTestYaml) if errFailedToLocateRepoFile != nil { - framework.Failf("unable to locate %q: %v", cryptoTestGen4Yaml, errFailedToLocateRepoFile) + framework.Failf("unable to locate %q: %v", compressTestYaml, errFailedToLocateRepoFile) } var dpPodName string @@ -134,11 +127,11 @@ func describeQatDpdkPlugin() { ginkgo.It("deploys a crypto pod (dpdk crypto-perf) requesting QAT resources [App:crypto-perf]", func(ctx context.Context) { ginkgo.By("submitting a crypto pod requesting QAT resources") - e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "apply", "-k", filepath.Dir(cryptoTestGen4YamlPath)) + e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "apply", "-k", filepath.Dir(cryptoTestYamlPath)) ginkgo.By("waiting the crypto pod to finish successfully") - err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, "qat-dpdk-test-crypto-perf-tc1-gen4", f.Namespace.Name, 300*time.Second) - gomega.Expect(err).To(gomega.BeNil(), utils.GetPodLogs(ctx, f, "qat-dpdk-test-crypto-perf-tc1-gen4", "crypto-perf")) + err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, "qat-dpdk-test-crypto-perf", f.Namespace.Name, 300*time.Second) + gomega.Expect(err).To(gomega.BeNil(), utils.GetPodLogs(ctx, f, "qat-dpdk-test-crypto-perf", "crypto-perf")) }) ginkgo.When("there is no app to run [App:noapp]", func() { @@ -159,35 +152,13 @@ func describeQatDpdkPlugin() { runCpaSampleCode(ctx, f, compression, resourceName) }) - ginkgo.When("there is no app to run [App:noapp]", func() { - ginkgo.It("does nothing", func() {}) - }) - }) - - ginkgo.Context("When QAT resources are available [Resource:generic]", func() { - ginkgo.BeforeEach(func() { - ginkgo.By("setting resourceName for generic resources") - resourceName = "qat.intel.com/generic" - }) - - ginkgo.It("deploys a crypto pod requesting QAT resources [App:crypto-perf]", func(ctx context.Context) { - ginkgo.By("submitting a crypto pod requesting QAT resources") - e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "apply", "-k", filepath.Dir(cryptoTestYamlPath)) - - ginkgo.By("waiting the crypto pod to finish successfully") - demoPodName := "qat-dpdk-test-crypto-perf-tc1" - err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, demoPodName, f.Namespace.Name, 60*time.Second) - gomega.Expect(err).To(gomega.BeNil(), utils.GetPodLogs(ctx, f, demoPodName, demoPodContainerName)) - }) - - ginkgo.It("deploys a compress pod requesting QAT resources [App:compress-perf]", func(ctx context.Context) { + ginkgo.It("deploys a compress pod (dpdk compress-perf) requesting QAT resources [App:compress-perf]", func(ctx context.Context) { ginkgo.By("submitting a compress pod requesting QAT resources") e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "apply", "-k", filepath.Dir(compressTestYamlPath)) ginkgo.By("waiting the compress pod to finish successfully") - demoPodName := "qat-dpdk-test-compress-perf-tc1" - err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, demoPodName, f.Namespace.Name, 60*time.Second) - gomega.Expect(err).To(gomega.BeNil(), utils.GetPodLogs(ctx, f, demoPodName, demoPodContainerName)) + err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, "qat-dpdk-test-compress-perf", f.Namespace.Name, 300*time.Second) + gomega.Expect(err).To(gomega.BeNil(), utils.GetPodLogs(ctx, f, "qat-dpdk-test-compress-perf", "compress-perf")) }) ginkgo.When("there is no app to run [App:noapp]", func() {