From 8712217ba6e9418766461f606c58d9d0f12b3862 Mon Sep 17 00:00:00 2001
From: Chris Sidebottom <chris.sidebottom@arm.com>
Date: Thu, 25 Nov 2021 13:30:18 +0000
Subject: [PATCH 1/2] [CI] Use correct variable for image name in Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ac06d6176a56..0b7d585d46c9 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -235,7 +235,7 @@ def cmake_build(image, path, make_flag) {
 
 def cpp_unittest(image) {
   sh (
-    script: "${docker_run} ${docker_type} ./tests/scripts/task_cpp_unittest.sh",
+    script: "${docker_run} ${image} ./tests/scripts/task_cpp_unittest.sh",
     label: "Build and run C++ tests",
   )
 }

From 3785e999c3d5b02a63ee3d0caa7ac8d27b4641b8 Mon Sep 17 00:00:00 2001
From: Chris Sidebottom <chris.sidebottom@arm.com>
Date: Thu, 25 Nov 2021 19:18:42 +0000
Subject: [PATCH 2/2] [CI] Correct image used in Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0b7d585d46c9..2b9d364e0918 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -531,7 +531,7 @@ stage('Integration Test') {
           timeout(time: max_time, unit: 'MINUTES') {
             ci_setup(ci_cpu)
             sh (
-              script: "${docker_run} ${ci_gpu} ./tests/scripts/task_python_frontend.sh",
+              script: "${docker_run} ${ci_cpu} ./tests/scripts/task_python_frontend.sh",
               label: "Run Python frontend tests",
             )
             junit "build/pytest-results/*.xml"