Merge pull request #541 from perftool-incubator/dev-kmr

add basic support for workshop's userenv build-policy parameter
perftool-incubator · Aug 16, 2024 · 47369eb · 47369eb
2 parents c5db4b9 + f2ee47b
commit 47369eb
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 25 deletions.
diff --git 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
@@ -1,15 +1,16 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
     "name": "alma8",
     "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
@@ -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
@@ -1,15 +1,16 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
     "name": "alma9",
     "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
@@ -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
@@ -1,5 +1,5 @@
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
diff --git a/userenvs/fedora38.json b/userenvs/fedora38.json
@@ -1,15 +1,16 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
     "name": "fedora38",
     "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
@@ -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
@@ -1,15 +1,16 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
     "name": "fedora39",
     "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
@@ -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
@@ -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
@@ -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
@@ -1,15 +1,16 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
     "name": "rhubi8",
     "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
@@ -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
@@ -1,15 +1,16 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
     "name": "rhubi9",
     "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
@@ -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
@@ -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
@@ -1,15 +1,16 @@
 {
   "workshop": {
     "schema": {
-      "version": "2023.02.16"
+      "version": "2024.08.07"
     }
   },
   "userenv": {
     "name": "stream9",
     "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
@@ -3,7 +3,8 @@
     "label": "CentOS Stream 9",
     "origin": {
       "image": "quay.io/centos/centos",
-      "tag": "stream9"
+      "tag": "stream9",
+      "build-policy": "missing"
     },
     "properties": {
       "platform": [