Merge pull request #553 from kacf/3.0.x

fix(grub-mender-grubenv): Boot failure because of missing storage.
mendersoftware · Mar 2, 2023 · a927257 · a927257
2 parents 42f45dd + 9856d13
commit a927257
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -100,7 +100,7 @@ build:
   services:
     - docker:dind
   tags:
-    - mender-qa-slave
+    - mender-qa-worker-generic
   before_script:
     - apt update && apt install -yy bash wget xz-utils awscli docker.io curl
 
@@ -162,7 +162,7 @@ convert_raspbian_raspberrypi4:
   services:
     - docker:dind
   tags:
-    - mender-qa-slave
+    - mender-qa-worker-mender-convert-tests
   timeout: 2h
   before_script:
     - *bash_helpers

diff --git a/configs/mender_grub_config b/configs/mender_grub_config
@@ -26,7 +26,7 @@ GRUB_VERSION=2.04
 MENDER_GRUB_KERNEL_BOOT_ARGS=""
 
 # grub-mender-grubenv is the Mender integration for the GRUB bootloader
-MENDER_GRUBENV_VERSION="eeb7ebd9e6558cf6bbe661b4f2e4e45d52efa305"
+MENDER_GRUBENV_VERSION="a525df022c10950ddbadad05adaefe7b2451ec62"
 MENDER_GRUBENV_URL="${MENDER_GITHUB_ORG}/grub-mender-grubenv/archive/${MENDER_GRUBENV_VERSION}.tar.gz"
 
 # Name of the storage device containing root filesystem partitions in GRUB