3 files changed, 21 insertions, 7 deletions

diff --git a/terraform-ci-infra/1n_nmd/vpp_device/conf/nomad/csit_shim.hcl b/terraform-ci-infra/1n_nmd/vpp_device/conf/nomad/csit_shim.hcl
index cf065429d1..9763088dcd 100644
--- a/terraform-ci-infra/1n_nmd/vpp_device/conf/nomad/csit_shim.hcl
+++ b/terraform-ci-infra/1n_nmd/vpp_device/conf/nomad/csit_shim.hcl
@@ -63,7 +63,7 @@ job "${job_name}" {
       # are specific to each driver, so please see specific driver
       # documentation for more information.
       config {
-        image        = "csit_shim-ubuntu1804:local"
+        image        = "${image_x86_64}"
         network_mode = "host"
         pid_mode     = "host"
         volumes      = [
@@ -133,7 +133,7 @@ job "${job_name}" {
       # are specific to each driver, so please see specific driver
       # documentation for more information.
       config {
-        image        = "csit_shim-ubuntu1804:local"
+        image        = "${image_aarch64}"
         network_mode = "host"
         pid_mode     = "host"
         volumes      = [
diff --git a/terraform-ci-infra/1n_nmd/vpp_device/main.tf b/terraform-ci-infra/1n_nmd/vpp_device/main.tf
index c4a3e27970..80c02ec316 100644
--- a/terraform-ci-infra/1n_nmd/vpp_device/main.tf
+++ b/terraform-ci-infra/1n_nmd/vpp_device/main.tf
@@ -5,11 +5,13 @@ locals {
 data "template_file" "nomad_job_csit_shim" {
   template    = file("${path.module}/conf/nomad/csit_shim.hcl")
   vars        = {
-    datacenters = local.datacenters
-    job_name    = var.csit_shim_job_name
-    group_count = var.csit_shim_group_count
-    cpu         = var.csit_shim_cpu
-    mem         = var.csit_shim_mem
+    datacenters   = local.datacenters
+    job_name      = var.csit_shim_job_name
+    group_count   = var.csit_shim_group_count
+    cpu           = var.csit_shim_cpu
+    mem           = var.csit_shim_mem
+    image_aarch64 = var.csit_shim_image_aarch64
+    image_x86_64  = var.csit_shim_image_x86_64
   }
 }
 
diff --git a/terraform-ci-infra/1n_nmd/vpp_device/variables.tf b/terraform-ci-infra/1n_nmd/vpp_device/variables.tf
index ca574e770a..893968bfc0 100644
--- a/terraform-ci-infra/1n_nmd/vpp_device/variables.tf
+++ b/terraform-ci-infra/1n_nmd/vpp_device/variables.tf
@@ -28,4 +28,16 @@ variable "csit_shim_mem" {
   description = "CSIT SHIM task memory"
   type        = number
   default     = 10000
+}
+
+variable "csit_shim_image_aarch64" {
+  description = "CSIT SHIM AARCH64 docker image"
+  type        = string
+  default     = "fdiotools/csit_shim-ubuntu2004:prod-aarch64"
+}
+
+variable "csit_shim_image_x86_64" {
+  description = "CSIT SHIM X86_64 docker image"
+  type        = string
+  default     = "fdiotools/csit_shim-ubuntu2004:prod-x86_64"
 }
\ No newline at end of file