Target v2024

Signed-off-by: Apertis CI <devel@lists.apertis.org>

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 
 variables:
   osname: apertis
-  release: v2024pre
+  release: v2024
 
 image: $CI_REGISTRY/infrastructure/${osname}-docker-images/${release}-testcases-builder
 
@@ -79,9 +79,9 @@ render-pages:
     deployment: apt
     image_name: ${osname}_${release}-${type}-${architecture}-${board}
     osname: apertis
-    release: v2024pre
+    release: v2024
     base_url: https://images.apertis.org
-    image_path: weekly/v2024pre
+    image_path: weekly/v2024
     image_buildid: "fakebuildid"
 
 .generate-tests-ostree:
@@ -94,9 +94,9 @@ render-pages:
     image_name: ${osname}_ostree_${release}-${type}-${architecture}-${board}
     image_bundle: ${osname}_ostree_${release}-${type}-${architecture}-${board}
     osname: apertis
-    release: v2024pre
+    release: v2024
     base_url: https://images.apertis.org
-    image_path: weekly/v2024pre
+    image_path: weekly/v2024
     image_buildid: "fakebuildid"
 
 .run-tests:

lava/aum-tpl.yaml

@@ -18,7 +18,7 @@ job_name: {{image_name}}-{{aum_test}}
       name: {{test_name}}
       definitions:
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           path: test-cases/{{test_name}}.yaml

lava/common-boot-tpl.yaml

@@ -132,19 +132,19 @@ actions:
       name: sanity-check
       definitions:
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           path: test-cases/sanity-check.yaml
           name: sanity-check
         - repository: https://gitlab.apertis.org/pkg/apertis-tests
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           path: misc/add-repo.yaml
           name: add-repo
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           path: test-cases/disk-rootfs-fsck.yaml

lava/common-qemu-boot-tpl.yaml

@@ -82,13 +82,13 @@ actions:
       name: sanity-check
       definitions:
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           path: test-cases/sanity-check.yaml
           name: sanity-check
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           path: test-cases/disk-rootfs-fsck.yaml

lava/config.yaml

 template-dir: lava/
 variables:
   bootfstype: ext2
-  release_version: "v2024pre"
-  imgpath: "daily/v2024pre"
+  release_version: "v2024"
+  imgpath: "daily/v2024"
   baseurl: "https://images.apertis.org"
   firststageurl: "https://images.apertis.org/release/v2019/v2019.1" # use a known good release for the first stage
   upgradable_url_prefix: "https://images.apertis.org/release"
   # Any release listed here MUST be in the OSTree ref-bindings in apertis-image-recipes:
-  # https://gitlab.apertis.org/infrastructure/apertis-image-recipes/-/blob/apertis/v2024pre/ostree-commit.yaml
+  # https://gitlab.apertis.org/infrastructure/apertis-image-recipes/-/blob/apertis/v2024/ostree-commit.yaml
   upgradable_release: "v2022"
   upgradable_build: "0"
   arch: amd64

lava/group-default-tpl.yaml

@@ -13,7 +13,7 @@ job_name: {{image_name}}-{{group}}
       definitions:
 {%- for test_name in tests %}
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           name: {{test_name}}

lava/group-modules-tpl.yaml

@@ -30,7 +30,7 @@ job_name: {{image_name}}-{{group}}
       definitions:
 {%- for test_name in tests %}
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           name: {{test_name}}

lava/group-nfs-tpl.yaml

@@ -91,7 +91,7 @@ actions:
       definitions:
 {%- for test_name in tests %}
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           name: {{test_name}}

lava/group-tiny-tpl.yaml

@@ -44,7 +44,7 @@ job_name: {{image_name}}-{{group}}
           name: set-branch-name
 {%- for test_name in tests %}
         - repository: https://gitlab.apertis.org/tests/apertis-test-cases.git
-          branch: 'apertis/v2024pre'
+          branch: 'apertis/v2024'
           history: False
           from: git
           name: {{test_name}}

test-cases/ade-commands.yaml

@@ -35,7 +35,7 @@ metadata:
 install:
   git-repos:
     - url: https://gitlab.apertis.org/pkg/apertis-tests.git
-      branch: 'apertis/v2024pre'
+      branch: 'apertis/v2024'
 
 run:
   steps:

test-cases/apertis-update-manager-ota-rollback.yaml

@@ -128,7 +128,7 @@ run:
     - |
         > Apr 29 09:47:19 apertis apertis-update-[485]: Auto update status: active
         Apr 29 09:47:19 apertis apertis-update-[485]: Ostree upgrade poll starting
-        Apr 29 09:47:21 apertis apertis-update-managerd[485]: libostree pull from 'origin' for apertis/v2024pre/armhf-uboot/fixedfunction complete
+        Apr 29 09:47:21 apertis apertis-update-managerd[485]: libostree pull from 'origin' for apertis/v2024/armhf-uboot/fixedfunction complete
                                                               security: GPG: disabled 
                                                               security: SIGN: commit http: TLS
                                                               non-delta: meta: 1 content: 0

test-cases/apertis-update-manager-rollback.yaml

@@ -32,7 +32,7 @@ metadata:
 install:
   git-repos:
     - url: https://gitlab.apertis.org/tests/aum-offline-upgrade.git
-      branch: 'apertis/v2024pre'
+      branch: 'apertis/v2024'
 
 run:
   steps:
@@ -110,7 +110,7 @@ run:
         >May 01 09:21:45 apertis apertis-update-[363]: mount added : /media/APERTIS
         May 01 09:21:45 apertis apertis-update-[363]: mount added : /media/update
         May 01 09:21:45 apertis apertis-update-[363]: Ostree static delta starting
-        May 01 09:21:45 apertis apertis-update-[363]: Metadata read from commit '710dbec2943510e4deb279cd6738a4a1a5b589eb6c4976e486d056e0308a02e1': {'ostree.ref-binding': <['apertis/v2024pre/armhf-uboot/fixedfunction']>, 'ostree.collection-binding': <'org.apertis.os'>}
+        May 01 09:21:45 apertis apertis-update-[363]: Metadata read from commit '710dbec2943510e4deb279cd6738a4a1a5b589eb6c4976e486d056e0308a02e1': {'ostree.ref-binding': <['apertis/v2024/armhf-uboot/fixedfunction']>, 'ostree.collection-binding': <'org.apertis.os'>}
         May 01 09:21:45 apertis apertis-update-[363]: Revision '710dbec2943510e4deb279cd6738a4a1a5b589eb6c4976e486d056e0308a02e1' is marked as blacklisted; skipping
         May 01 09:21:45 apertis apertis-update-[363]: Ostree already up to date
 

test-cases/apparmor-basic-profiles.yaml

@@ -34,7 +34,7 @@ metadata:
 install:
   git-repos:
     - url: https://gitlab.apertis.org/tests/apparmor-basic-profiles.git
-      branch: 'apertis/v2024pre'
+      branch: 'apertis/v2024'
 
 run:
   steps:

test-cases/apparmor-bluez-avrcp-volume.yaml

@@ -18,9 +18,9 @@ metadata:
 
   macro_ostree_preconditions:
     - reponame: apparmor-bluez-setup
-      branch: apertis/v2024pre
+      branch: apertis/v2024
     - reponame: bluez-phone
-      branch: apertis/v2024pre
+      branch: apertis/v2024
   pre-conditions:
     - "Please note that connman disables bluetooth by default on a fresh image.
        If it's already enabled, connmanctl will give an \"In progress\" error that

test-cases/apparmor-bluez-setup.yaml

@@ -21,9 +21,9 @@ metadata:
 
   macro_ostree_preconditions:
     - reponame: apparmor-bluez-setup
-      branch: apertis/v2024pre
+      branch: apertis/v2024
     - reponame: bluez-setup
-      branch: apertis/v2024pre
+      branch: apertis/v2024
   pre-conditions:
     - "Please note that connman disables bluetooth by default on a fresh image.
        If it's already enabled, connmanctl will give an \"In progress\" error that

test-cases/apparmor-bluez.yaml

@@ -18,7 +18,7 @@ metadata:
 
   macro_ostree_preconditions:
     reponame: apparmor-bluez
-    branch: apertis/v2024pre
+    branch: apertis/v2024
 
   pre-conditions:
     - "Please note that connman disables bluetooth by default on a fresh image."

test-cases/apparmor-chaiwala-system.yaml

@@ -33,7 +33,7 @@ metadata:
 install:
   git-repos:
     - url: https://gitlab.apertis.org/tests/apparmor-chaiwala-system.git
-      branch: 'apertis/v2024pre'
+      branch: 'apertis/v2024'
 
 run:
   steps:

test-cases/apparmor-dbus.yaml

@@ -31,7 +31,7 @@ metadata:
 install:
   git-repos:
     - url: https://gitlab.apertis.org/tests/apparmor-dbus.git
-      branch: 'apertis/v2024pre'
+      branch: 'apertis/v2024'
 
 run:
   steps:

test-cases/apparmor-functional-demo.yaml

@@ -36,7 +36,7 @@ install:
     - apertis-tests-apparmor-report
   git-repos:
     - url: https://gitlab.apertis.org/pkg/apertis-tests.git
-      branch: 'apertis/v2024pre'
+      branch: 'apertis/v2024'
 
 run:
   steps:

test-cases/apparmor-geoclue.yaml

@@ -37,7 +37,7 @@ install:
     - geoclue-2-demo
   git-repos:
     - url: https://gitlab.apertis.org/tests/geoclue.git
-      branch: 'apertis/v2024pre'
+      branch: 'apertis/v2024'
 
 run:
   steps: