telco5g: use env vars to set profile cpus

Following openshift/cluster-node-tuning-operator#909, we now can provide the CPU specifications for the performance profile that will be used as a base for the functional tests. Given that the NTO and cnf-features-deploy u/s CI is using vm-node clusters and that the deployment settings are constant, according to the PPC CPU calculation using must-gather data, we export the result in environment variables indicating reserved and isolated CPUs. Note: this will need to be maintained should node cpu settings change. in gcp. Signed-off-by: Shereen Haj <shajmakh@redhat.com>
shajmakh · Feb 29, 2024 · 28bf166 · 28bf166
1 parent f661e21
commit 28bf166
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/...or/config/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-master.yaml b/...or/config/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-master.yaml
@@ -84,7 +84,10 @@ tests:
         ci-org-name openshift-kni
     test:
     - as: e2e-aws-ci-tests
-      commands: FEATURES_ENVIRONMENT=ci IPERF3_BITRATE_OVERRIDE="300000000" make functests-on-ci
+      commands: |
+        export RESERVED_CPU_SET="0,2"
+        export ISOLATED_CPU_SET="1,3"
+        FEATURES_ENVIRONMENT=ci IPERF3_BITRATE_OVERRIDE="300000000" make functests-on-ci
       from: src
       resources:
         requests:

diff --git a/...openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml b/...openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
@@ -92,7 +92,10 @@ tests:
     test:
     - as: e2e-pao-mixed-cpus
       cli: latest
-      commands: CLUSTER=mcp-only make cluster-label-worker-cnf cluster-deploy-pao
+      commands: |
+        export RESERVED_CPU_SET="0,2"
+        export ISOLATED_CPU_SET="1,3" 
+        CLUSTER=mcp-only make cluster-label-worker-cnf cluster-deploy-pao
         pao-functests-mixedcpus
       from: src
       resources:
@@ -133,7 +136,10 @@ tests:
     test:
     - as: test
       cli: latest
-      commands: CLUSTER=mcp-only make cluster-deploy-pao && make pao-functests
+      commands: |
+        export RESERVED_CPU_SET="0,2"
+        export ISOLATED_CPU_SET="1,3" 
+        CLUSTER=mcp-only make cluster-deploy-pao && make pao-functests
       from: src
       resources:
         requests:
@@ -148,7 +154,10 @@ tests:
     test:
     - as: test
       cli: latest
-      commands: CLUSTER=mcp-only make cluster-deploy-pao && make pao-functests-updating-profile
+      commands: |
+        export RESERVED_CPU_SET="0,2"
+        export ISOLATED_CPU_SET="1,3" 
+        CLUSTER=mcp-only make cluster-deploy-pao && make pao-functests-updating-profile
       from: src
       resources:
         requests:
@@ -164,7 +173,10 @@ tests:
     test:
     - as: test
       cli: latest
-      commands: CLUSTER=mcp-only make cluster-deploy-pao && make pao-functests-performance-workloadhints
+      commands: |
+        export RESERVED_CPU_SET="0,2"
+        export ISOLATED_CPU_SET="1,3" 
+        CLUSTER=mcp-only make cluster-deploy-pao && make pao-functests-performance-workloadhints
       from: src
       resources:
         requests: