gitlab-ci: Update test generation tool

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>

.gitlab-ci.yml

@@ -93,8 +93,7 @@ pages:
     - lightweight
   stage: deploy
   variables:
-    profile_name: ${osname}-${type}-${architecture}-${board}
-    image_prefix: ${osname}_${release}-${type}-${architecture}-${board}
+    deployment: apt
     image_name: ${osname}_${release}-${type}-${architecture}-${board}
     osname: apertis
     release: v2023dev1
@@ -109,9 +108,8 @@ pages:
     - lightweight
   stage: deploy
   variables:
-    profile_name: ${osname}_ostree-${type}-${architecture}-${board}
-    image_prefix: ${osname}_ostree_${release}-${type}-${architecture}-${board}
-    image_name: ${osname}_${release}-${type}-${architecture}-${board}
+    deployment: ostree
+    image_name: ${osname}_ostree_${release}-${type}-${architecture}-${board}
     osname: apertis
     release: v2023dev1
     base_url: https://images.apertis.org
@@ -142,8 +140,6 @@ submit-tests-apt-arm64-fixedfunction-rpi64-rpi4:
     - .submit-tests-apt
     - .arm64-rpi64
     - .fixedfunction
-  variables:
-    profile_name: ${osname}-${type}-${architecture}-${board}-rpi4
 
 submit-tests-apt-amd64-hmi-uefi:
   extends:
@@ -192,8 +188,6 @@ submit-tests-ostree-arm64-fixedfunction-rpi64-rpi4:
     - .submit-tests-ostree
     - .arm64-rpi64
     - .fixedfunction
-  variables:
-    profile_name: ${osname}-${type}-${architecture}-${board}-rpi4
 
 submit-tests-ostree-amd64-hmi-uefi:
   extends:
@@ -206,5 +200,3 @@ submit-tests-ostree-arm64-hmi-rpi64-rpi4:
     - .submit-tests-ostree
     - .arm64-rpi64
     - .hmi
-  variables:
-    profile_name: ${osname}-${type}-${architecture}-${board}-rpi4

.gitlab-ci/templates-submit-tests.yml

@@ -9,10 +9,9 @@
     # {{baseurl}}/{{image_path}}/{{image_buildid}}/{{arch}}/{{type}}/{{image_name}}.img.gz
     # where `arch` and `type` are derived from `profile_name`
     baseurl: https://images.apertis.org
-    image_buildid: "v2021.0"
-    image_name: apertis_v2021-minimal-amd64-uefi_v2021.0
-    image_path: release/v2021
-    profile_name: apertis-minimal-amd64-uefi
+    image_name: apertis_v2023dev1-minimal-amd64-uefi_v2023dev1.1
+    image_buildid: "v2023dev1.1"
+    image_path: release/v2023dev1
     source_commit: $CI_COMMIT_SHA
     source_job: $CI_JOB_URL
     source_pipeline: $CI_PIPELINE_URL
@@ -25,15 +24,18 @@
     submit_extra_args: ""
   script:
     - env --null | sort -z | tr '\0' '\n'
-    - lava-submit
-        -c ${LQA_CONFIG}
-        -g lava/profiles.yaml
-        --profile "${profile_name}"
-        -t "release:${release}"
-        -t "release_version:${release}"
+    - ./generate-jobs.py
+        -d lava/devices.yaml
+        --config lava/config.yaml
+        --release ${release}
+        --arch ${architecture}
+        --board ${board}
+        --osname ${osname}
+        --type ${type}
+        --date ${image_buildid}
+        --deployment ${deployment}
+        --name ${image_name}
         -t "baseurl:${baseurl}"
-        -t "image_date:${image_buildid}"
-        -t "image_name:${image_name}"
         -t "imgpath:${image_path}"
         -t "source_commit:${source_commit}"
         -t "source_job:${source_job}"
@@ -41,10 +43,16 @@
         -t "source_project:${source_project}"
         -t "source_ref:${source_ref}"
         -t "source_wip:${source_wip}"
+        --verbose
+        --metadata-file metadata.json
+    - ./lava-submit.py
+        --jobid-file jobids.json
+        --metadata-file metadata.json
         --callback-secret "${QA_REPORT_TOKEN}"
         --callback-url https://lavaphabbridge.apertis.org/
-        --verbose
+        -c ${LQA_CONFIG} submit
         $submit_extra_args
+        ./job-${osname}*.yaml
   rules:
     - if: '$CI_MERGE_REQUEST_ID'
       when: never