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

.github/workflows/workshop-ci.yaml

@@ -21,28 +21,55 @@ concurrency:
 
 jobs:
   workshop-ci:
-    runs-on: ubuntu-latest
+    runs-on: [ self-hosted, workshop ]
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Install Perl Dependencies
+    - name: Install git
       run: |
-        sudo apt install libcoro-perl libjson-perl libjson-xs-perl libjson-validator-perl libdata-uuid-perl libdigest-sha-perl libcompress-raw-lzma-perl libcompress-raw-zlib-perl libcompress-raw-bzip2-perl cpanminus
-        echo
-        sudo cpanm IO::Uncompress::UnXz IO::Compress::Xz
+        sudo dnf install -y git
+
+    - name: Install container dependencies
+      run: |
+        sudo dnf install -y skopeo podman buildah
+
+    - name: Install Perl dependencies
+      run: |
+        sudo dnf install -y perl-Coro perl-JSON perl-JSON-XS perl-JSON-Validator perl-Data-UUID perl-Digest-SHA perl-Archive-Extract-xz-IO-Uncompress-UnXz.noarch
 
     - name: Install Toolbox
       run: |
+        if [ -d ~/toolbox ]; then
+          rm -Rf ~/toolbox
+        fi
         pushd ~/
         git clone https://github.com/perftool-incubator/toolbox.git
 
-    - name: Run workshop
+    - name: Run workshop - dump-config
       run: |
         export TOOLBOX_HOME=~/toolbox
         echo
-        sudo --preserve-env=TOOLBOX_HOME ./workshop.pl --label workshop-ci-dump-config --userenv ./userenvs/fedora36-ci.json --dump-config true
+        sudo --preserve-env=TOOLBOX_HOME ./workshop.pl --log-level verbose --label workshop-ci-dump-config --userenv ./userenvs/fedora-ci.json --dump-config true
+
+    - name: Run workshop - dump-config - force-build-policy missing
+      run: |
+        export TOOLBOX_HOME=~/toolbox
         echo
-        sudo --preserve-env=TOOLBOX_HOME ./workshop.pl --label workshop-ci-dump-files --userenv ./userenvs/fedora36-ci.json --dump-files true
+        sudo --preserve-env=TOOLBOX_HOME ./workshop.pl --log-level verbose --label workshop-ci-dump-config --userenv ./userenvs/fedora-ci.json --dump-config true --force-build-policy missing
+
+    - name: Run workshop - dump-files
+      run: |
+        export TOOLBOX_HOME=~/toolbox
         echo
-        sudo --preserve-env=TOOLBOX_HOME ./workshop.pl --label workshop-ci --userenv ./userenvs/fedora36-ci.json --log-level verbose
+        sudo --preserve-env=TOOLBOX_HOME ./workshop.pl --log-level verbose --label workshop-ci-dump-files --userenv ./userenvs/fedora-ci.json --dump-files true
+
+    - name: Run workshop
+      run: |
+        export TOOLBOX_HOME=~/toolbox
+        echo
+        sudo --preserve-env=TOOLBOX_HOME ./workshop.pl --log-level verbose --label workshop-ci --userenv ./userenvs/fedora-ci.json
+
+    - name: Cleanup toolbox
+      run: |
+        rm -Rf ~/toolbox

schema.json

@@ -74,7 +74,8 @@
 				"2020.04.30",
 				"2022.07.25",
 				"2023.02.16",
-				"2024.03.22"
+				"2024.03.22",
+				"2024.08.07"
 			    ]
 			}
 		    },
@@ -110,6 +111,13 @@
 			"tag": {
 			    "type": "string",
 			    "minLength": 1
+			},
+			"build-policy": {
+			    "type": "string",
+			    "enum": [
+				"missing",
+				"ifnewer"
+			    ]
 			}
 		    },
 		    "required": [

userenvs/fedora36-ci.json → userenvs/fedora-ci.json

@@ -1,15 +1,16 @@
 {
     "workshop": {
 	"schema": {
-	    "version": "2023.02.16"
+	    "version": "2024.08.07"
 	}
     },
     "userenv": {
-	"name": "fedora36",
-	"label": "Fedora 36",
+	"name": "fedora40",
+	"label": "Fedora 40",
 	"origin": {
 	    "image": "docker.io/library/fedora",
-	    "tag": "36"
+	    "tag": "40",
+	    "build-policy": "ifnewer"
 	},
 	"properties": {
 	    "platform": [
@@ -28,11 +29,11 @@
     },
     "requirements": [
 	{
-	    "name": "python39",
+	    "name": "python3",
 	    "type": "distro",
 	    "distro_info": {
 		"packages": [
-		    "python39"
+		    "python3"
 		]
 	    }
 	},