From f2ee47b0a2998538de19c2dbdfc265a8b2dd4bf7 Mon Sep 17 00:00:00 2001
From: Karl Rister <krister@redhat.com>
Date: Mon, 12 Aug 2024 15:15:42 -0500
Subject: [PATCH] add basic support for workshop's userenv build-policy
 parameter

---
 rickshaw-run                    | 3 +++
 userenvs/alma8.json             | 5 +++--
 userenvs/alma8/userenv.json     | 3 ++-
 userenvs/alma9.json             | 5 +++--
 userenvs/alma9/userenv.json     | 3 ++-
 userenvs/components/schema.json | 2 +-
 userenvs/fedora38.json          | 5 +++--
 userenvs/fedora38/userenv.json  | 3 ++-
 userenvs/fedora39.json          | 5 +++--
 userenvs/fedora39/userenv.json  | 3 ++-
 userenvs/rhel-ai.json           | 3 ++-
 userenvs/rhel-ai/userenv.json   | 3 ++-
 userenvs/rhubi8.json            | 5 +++--
 userenvs/rhubi8/userenv.json    | 3 ++-
 userenvs/rhubi9.json            | 5 +++--
 userenvs/rhubi9/userenv.json    | 3 ++-
 userenvs/stream8-flexran.json   | 2 +-
 userenvs/stream9.json           | 5 +++--
 userenvs/stream9/userenv.json   | 3 ++-
 19 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/rickshaw-run b/rickshaw-run
index 1ac27b2b..0d5a3396 100755
--- a/rickshaw-run
+++ b/rickshaw-run
@@ -956,6 +956,9 @@ sub source_container_image {
             @$userenv_ref{'requirements'} = \@reqs;
             $$userenv_ref{'userenv'}{'origin'}{'image'} = $run{'dest-image-url'};
             $$userenv_ref{'userenv'}{'origin'}{'tag'} = $tag;
+            if (defined $$userenv_ref{'userenv'}{'origin'}{'build-policy'}) {
+                delete $$userenv_ref{'userenv'}{'origin'}{'build-policy'};
+            }
             my $userenv_file = $config_dir . "/userenv-" . $tag . ".json";
             put_json_file($userenv_file, $userenv_ref);
             $userenv_arg = " --userenv " . $userenv_file;
diff --git a/userenvs/alma8.json b/userenvs/alma8.json
index 1b9dc7ae..51472d62 100644
--- a/userenvs/alma8.json
+++ b/userenvs/alma8.json
@@ -1,7 +1,7 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
@@ -9,7 +9,8 @@
     "label": "AlmaLinux 8",
     "origin": {
       "image": "quay.io/almalinuxorg/8-base",
-      "tag": "8"
+      "tag": "8",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/alma8/userenv.json b/userenvs/alma8/userenv.json
index 63f1bf87..76ee6960 100644
--- a/userenvs/alma8/userenv.json
+++ b/userenvs/alma8/userenv.json
@@ -3,7 +3,8 @@
     "label": "AlmaLinux 8",
     "origin": {
       "image": "quay.io/almalinuxorg/8-base",
-      "tag": "8"
+      "tag": "8",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/alma9.json b/userenvs/alma9.json
index d97aeb2c..e85562d1 100644
--- a/userenvs/alma9.json
+++ b/userenvs/alma9.json
@@ -1,7 +1,7 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
@@ -9,7 +9,8 @@
     "label": "AlmaLinux 9",
     "origin": {
       "image": "quay.io/almalinux/almalinux",
-      "tag": "9"
+      "tag": "9",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/alma9/userenv.json b/userenvs/alma9/userenv.json
index c4c3b678..b0a8be43 100644
--- a/userenvs/alma9/userenv.json
+++ b/userenvs/alma9/userenv.json
@@ -3,7 +3,8 @@
     "label": "AlmaLinux 9",
     "origin": {
       "image": "quay.io/almalinux/almalinux",
-      "tag": "9"
+      "tag": "9",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/components/schema.json b/userenvs/components/schema.json
index 425b6aff..245dc8ae 100644
--- a/userenvs/components/schema.json
+++ b/userenvs/components/schema.json
@@ -1,5 +1,5 @@
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
diff --git a/userenvs/fedora38.json b/userenvs/fedora38.json
index 99831c09..5e3d4a75 100644
--- a/userenvs/fedora38.json
+++ b/userenvs/fedora38.json
@@ -1,7 +1,7 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
@@ -9,7 +9,8 @@
     "label": "Fedora 38",
     "origin": {
       "image": "registry.fedoraproject.org/fedora",
-      "tag": "38"
+      "tag": "38",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/fedora38/userenv.json b/userenvs/fedora38/userenv.json
index d46d0ae0..201991d6 100644
--- a/userenvs/fedora38/userenv.json
+++ b/userenvs/fedora38/userenv.json
@@ -3,7 +3,8 @@
     "label": "Fedora 38",
     "origin": {
       "image": "registry.fedoraproject.org/fedora",
-      "tag": "38"
+      "tag": "38",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/fedora39.json b/userenvs/fedora39.json
index c49b1ba7..1b6c6960 100644
--- a/userenvs/fedora39.json
+++ b/userenvs/fedora39.json
@@ -1,7 +1,7 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
@@ -9,7 +9,8 @@
     "label": "Fedora 39",
     "origin": {
       "image": "registry.fedoraproject.org/fedora",
-      "tag": "39"
+      "tag": "39",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/fedora39/userenv.json b/userenvs/fedora39/userenv.json
index 057644b2..12f41359 100644
--- a/userenvs/fedora39/userenv.json
+++ b/userenvs/fedora39/userenv.json
@@ -3,7 +3,8 @@
     "label": "Fedora 39",
     "origin": {
       "image": "registry.fedoraproject.org/fedora",
-      "tag": "39"
+      "tag": "39",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/rhel-ai.json b/userenvs/rhel-ai.json
index 5d566235..afb523fc 100644
--- a/userenvs/rhel-ai.json
+++ b/userenvs/rhel-ai.json
@@ -9,7 +9,8 @@
     "label": "RHEL AI",
     "origin": {
       "image": "quay.io/kvalin/instructlab-training",
-      "tag": "latest-jul10"
+      "tag": "latest-jul10",
+      "build-policy": "ifnewer"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/rhel-ai/userenv.json b/userenvs/rhel-ai/userenv.json
index c548cdd4..31e0a7d6 100644
--- a/userenvs/rhel-ai/userenv.json
+++ b/userenvs/rhel-ai/userenv.json
@@ -3,7 +3,8 @@
   "label": "RHEL AI",
   "origin": {
     "image": "quay.io/kvalin/instructlab-training",
-    "tag": "latest-jul10"
+    "tag": "latest-jul10",
+    "build-policy": "ifnewer"
   },
   "properties": {
     "platform": [
diff --git a/userenvs/rhubi8.json b/userenvs/rhubi8.json
index a45859d1..dc0b570f 100644
--- a/userenvs/rhubi8.json
+++ b/userenvs/rhubi8.json
@@ -1,7 +1,7 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
@@ -9,7 +9,8 @@
     "label": "Red Hat UBI 8",
     "origin": {
       "image": "registry.access.redhat.com/ubi8/ubi",
-      "tag": "latest"
+      "tag": "latest",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/rhubi8/userenv.json b/userenvs/rhubi8/userenv.json
index 186d4efc..bdf4c03a 100644
--- a/userenvs/rhubi8/userenv.json
+++ b/userenvs/rhubi8/userenv.json
@@ -3,7 +3,8 @@
     "label": "Red Hat UBI 8",
     "origin": {
       "image": "registry.access.redhat.com/ubi8/ubi",
-      "tag": "latest"
+      "tag": "latest",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/rhubi9.json b/userenvs/rhubi9.json
index 56a5a840..ea00f468 100644
--- a/userenvs/rhubi9.json
+++ b/userenvs/rhubi9.json
@@ -1,7 +1,7 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
@@ -9,7 +9,8 @@
     "label": "Red Hat UBI 9",
     "origin": {
       "image": "registry.access.redhat.com/ubi9/ubi",
-      "tag": "latest"
+      "tag": "latest",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/rhubi9/userenv.json b/userenvs/rhubi9/userenv.json
index 7b7af2fe..fc690479 100644
--- a/userenvs/rhubi9/userenv.json
+++ b/userenvs/rhubi9/userenv.json
@@ -3,7 +3,8 @@
     "label": "Red Hat UBI 9",
     "origin": {
       "image": "registry.access.redhat.com/ubi9/ubi",
-      "tag": "latest"
+      "tag": "latest",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/stream8-flexran.json b/userenvs/stream8-flexran.json
index 8c68154a..59ec662d 100644
--- a/userenvs/stream8-flexran.json
+++ b/userenvs/stream8-flexran.json
@@ -1,7 +1,7 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
diff --git a/userenvs/stream9.json b/userenvs/stream9.json
index f521d285..b1eb78eb 100644
--- a/userenvs/stream9.json
+++ b/userenvs/stream9.json
@@ -1,7 +1,7 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
@@ -9,7 +9,8 @@
     "label": "CentOS Stream 9",
     "origin": {
       "image": "quay.io/centos/centos",
-      "tag": "stream9"
+      "tag": "stream9",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [
diff --git a/userenvs/stream9/userenv.json b/userenvs/stream9/userenv.json
index c54f99dc..0ffe6d81 100644
--- a/userenvs/stream9/userenv.json
+++ b/userenvs/stream9/userenv.json
@@ -3,7 +3,8 @@
     "label": "CentOS Stream 9",
     "origin": {
       "image": "quay.io/centos/centos",
-      "tag": "stream9"
+      "tag": "stream9",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [