From e7fbfa00d40525e31f3666c8778a4a821c98558a Mon Sep 17 00:00:00 2001
From: David Laine <laine@hpe.com>
Date: Fri, 7 Jul 2023 13:09:10 -0500
Subject: [PATCH] CASMCMS-8707 - push arch env vars to all containers in IMS
 jobs.

---
 CHANGELOG.md                                                | 4 ++++
 .../cray-ims-v2-image-create-kiwi-ng-job-template.yaml      | 2 ++
 .../templates/cray-ims-v2-image-customize-job-template.yaml | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f45e46..7f988f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.9.7] - 2023-07-07
+### Changed
+- CASMCMS-8707 - push arch env vars to all containers in IMS jobs.
+
 ## [3.9.6] - 2023-06-27
 ### Changed
 - CASMCMS-8686 - Fix schema update of jobs records.
diff --git a/kubernetes/cray-ims/templates/cray-ims-v2-image-create-kiwi-ng-job-template.yaml b/kubernetes/cray-ims/templates/cray-ims-v2-image-create-kiwi-ng-job-template.yaml
index 9b02088..3755eee 100644
--- a/kubernetes/cray-ims/templates/cray-ims-v2-image-create-kiwi-ng-job-template.yaml
+++ b/kubernetes/cray-ims/templates/cray-ims-v2-image-create-kiwi-ng-job-template.yaml
@@ -338,6 +338,8 @@ data:
               value: "$ssh_jail"
             - name: JOB_ENABLE_DKMS
               value: "$job_enable_dkms"
+            - name: BUILD_ARCH
+              value: "$job_arch"
             volumeMounts:
             - name: image-vol
               mountPath: /mnt/image
diff --git a/kubernetes/cray-ims/templates/cray-ims-v2-image-customize-job-template.yaml b/kubernetes/cray-ims/templates/cray-ims-v2-image-customize-job-template.yaml
index a741902..56fbcce 100644
--- a/kubernetes/cray-ims/templates/cray-ims-v2-image-customize-job-template.yaml
+++ b/kubernetes/cray-ims/templates/cray-ims-v2-image-customize-job-template.yaml
@@ -86,6 +86,10 @@ data:
               value: "$id"
             - name: DOWNLOAD_MD5SUM
               value: "$download_md5sum"
+            - name: JOB_ENABLE_DKMS
+              value: "$job_enable_dkms"
+            - name: BUILD_ARCH
+              value: "$job_arch"
             volumeMounts:
             - name: image-vol
               mountPath: /mnt/image
@@ -143,6 +147,8 @@ data:
               value: "$id"
             - name: SSH_JAIL
               value: "$ssh_jail"
+            - name: BUILD_ARCH
+              value: "$job_arch"
             - name: S3_BUCKET
               value: "$s3_bucket"
             - name: S3_ACCESS_KEY