Further fixes on envvar passthrough on packer scripts. Refs #21461

[arvados-dev.git] / jenkins / packer-images / jenkins-image-arvados-tests.json

diff --git a/jenkins/packer-images/jenkins-image-arvados-tests.json b/jenkins/packer-images/jenkins-image-arvados-tests.json
index 8ec6766ec0716540e69988b731de8d1279cf9918..609b21aff1ad3b1d77d39b42bfbb013b63ba5883 100644 (file)
--- a/jenkins/packer-images/jenkins-image-arvados-tests.json
+++ b/jenkins/packer-images/jenkins-image-arvados-tests.json
@@ -1,13 +1,14 @@
 {
   "variables": {
-        "key_file": "{{env `packerbuildkey`}}"
+        "key_file": "{{env `packerbuildkey`}}",
+        "git_hash": "{{env `git_hash`}}"
     },
   "builders": [
     {
       "type": "googlecompute",
       "account_file": "{{user `key_file` }}",
       "project_id": "phoenix-project-42-ci",
-      "source_image": "debian-10-buster-v20210916",
+      "source_image": "debian-11-bullseye-v20231010",
       "zone": "us-central1-b",
       "disk_size": "20",
       "image_name": "jenkins-image-arvados-tests-{{isotime \"20060102150405\"}}",
@@ -27,6 +28,9 @@
     },
     {
       "type": "shell",
+      "environment_vars": [
+        "GIT_HASH={{ user `git_hash` }}"
+      ],
       "script": "./jenkins-image-arvados-tests.sh"
     }
   ]