BCF-6382: Merge release/2.9-9-cove to master

Jenkinsfile

@@ -3,9 +3,9 @@ import nable.cove.helpers.ShellHelper
 import nable.cove.SecretManager
 
 final String jobName = env.JOB_NAME.split('/')[-2]
-final String branchName = env.CHANGE_BRANCH ?: env.BRANCH_NAME
+final String branchName = env.CHANGE_TARGET ?: env.BRANCH_NAME
 final boolean isProd = jobName.endsWith('-prd')
-final boolean isProdBranch = branchName == 'master' || branchName.startsWith('release')
+final boolean isProdBranch = branchName == 'master'
 final String envType = isProd ? 'prd' : 'dev'
 
 def String repositoryName = 'rear'
@@ -55,8 +55,10 @@ pipeline {
             steps {
                 script {
                     if (isProd != isProdBranch) {
-                        echo "Environment mismatch: isProd=${isProd}, isProdBranch=${isProdBranch}. Skipping build."
+                        echo "Environment mismatch: target branch is ${branchName}, job is ${jobName}. Skipping build."
                         shouldBuild = false
+                    } else {
+                        echo "Environment match: target branch is ${branchName}, job is ${jobName}. Proceeding with build."
                     }
 
                     secretManager = new SecretManager(

Makefile

@@ -2,6 +2,7 @@
 #   cp -a etc/rear/{mappings,templates} ...
 # assumes bash. So its better to set SHELL to bash explicitly, using the one from PATH
 # to also work on MacOS with Homebrew-installed bash
+# test
 SHELL = bash
 
 # disable parallel execution of make
@@ -34,12 +35,22 @@ else
 			git_date := $(shell git log -n 1 --format="%ai")
 			git_ref := $(shell git rev-parse HEAD | cut -c 1-8)
 			git_count := $(shell git rev-list HEAD --no-merges | wc -l)
-			git_branch_suffix = $(shell echo "$${CHANGE_BRANCH:-$${BRANCH_NAME:-$$(git symbolic-ref HEAD || echo unknown)}}" | sed -e 's,^.*/,,' -e "s/[^A-Za-z0-9]//g")
+			git_branch_name = $(shell echo "$${CHANGE_BRANCH:-$${BRANCH_NAME:-$$(git symbolic-ref HEAD || echo unknown)}}")
+			git_branch_suffix = $(shell echo "$(git_branch_name)" | sed -e 's,^.*/,,' -e "s/[^A-Za-z0-9]//g")
+			cove_suffix = $(git_branch_suffix)
+			release_suffix = $(shell echo "$(git_branch_name)" | sed -nE 's/^.*?release\/([0-9.-]*-cove).*/\1/p')
+			ifneq ($(release_suffix),)
+				cove_suffix = $(release_suffix)
+			endif
+			feature_suffix = $(shell echo "$(git_branch_name)" | sed -nE 's/^.*?(feature|hotfix)\/([A-Za-z0-9_-]+-[0-9]+).*/\2/p')
+			ifneq ($(feature_suffix),)
+				cove_suffix = $(feature_suffix)
+			endif
 			git_status := $(shell git status --porcelain)
-			git_stamp := $(git_count).$(git_ref).$(git_branch_suffix)
 			ifneq ($(git_status),)
-				git_stamp := $(git_stamp).changed
-			endif # git_status
+				changed_suffix = .changed
+			endif
+			git_stamp := $(git_count).$(git_ref).$(git_branch_suffix)
 		else # no git
 			git_date := now
 			git_ref := 0
@@ -50,9 +61,17 @@ else
 	endif # has .git
 	git_stamp ?= 0.0.unknown
 
-    distversion = $(version)-git.$(git_stamp)
-    debrelease = 0git.$(git_stamp)
-    rpmrelease = .git.$(git_stamp)
+    ifneq ($(release_suffix),)
+        distversion = $(cove_suffix)$(changed_suffix)
+    else
+        ifneq ($(feature_suffix),)
+            distversion = $(version)-$(git_count).$(git_ref).$(cove_suffix)$(changed_suffix)
+        else # is not release version
+            distversion = $(version)-$(git_stamp)$(changed_suffix)
+        endif
+    endif # is release version
+    debrelease = 0git.$(git_stamp)$(changed_suffix)
+    rpmrelease = .git.$(git_stamp)$(changed_suffix)
     obsproject = Archiving:Backup:Rear:Snapshot
     obspackage = $(name)
 

tests/COVE/000_save_future_dangling_efi_entries.bats

@@ -1,3 +1,5 @@
+#!/usr/bin/env bats
+
 setup_file() {
     export REAR_SHARE_DIR="$(realpath "$BATS_TEST_DIRNAME/../../usr/share/rear")"
     export USING_UEFI_BOOTLOADER="yes"

tests/COVE/001_remove_dangling_efi_entries.bats

@@ -1,3 +1,5 @@
+#!/usr/bin/env bats
+
 setup_file() {
     export REAR_SHARE_DIR="$(realpath "$BATS_TEST_DIRNAME/../../usr/share/rear")"
     export USING_UEFI_BOOTLOADER="yes"

tests/COVE/002_upgrade_bootloaders_on_debian10.bats

@@ -0,0 +1,107 @@
+#!/usr/bin/env bats
+
+#
+# Unit tests for upgrading Shim and GRUB bootloaders on Debian 10
+#
+
+function setup_file() {
+    REAR_SHARE_DIR="$(realpath "$BATS_TEST_DIRNAME/../../usr/share/rear")"
+    export REAR_SHARE_DIR
+}
+
+function setup() {
+    # shellcheck disable=SC1091
+    source "$REAR_SHARE_DIR/lib/global-functions.sh"
+
+    function LogPrint() {
+        echo "$@"
+    }
+
+    OS_VERSION=10
+    USING_UEFI_BOOTLOADER=yes
+    function is_cove_in_azure() {
+        false
+    }
+    EFI_STUB=no
+    UEFI_BOOTLOADER=/boot/efi/EFI/debian/shimx64.efi
+}
+
+@test "Shim and GRUB are upgraded successfully" {
+    function upgrade_bootloaders() {
+        return 0
+    }
+
+    run source "$REAR_SHARE_DIR/finalize/COVE/Debian/620_upgrade_bootloaders.sh"
+    [ "$status" -eq 0 ]
+
+    local expected_output="Upgraded signed Shim and GRUB bootloaders for this system."
+    [ "$output" = "$expected_output" ]
+}
+
+@test "Failed to upgrade Shim and GRUB" {
+    function upgrade_bootloaders() {
+        return 1
+    }
+
+    run source "$REAR_SHARE_DIR/finalize/COVE/Debian/620_upgrade_bootloaders.sh"
+    [ "$status" -eq 0 ]
+
+    local expected_output="Failed to upgrade signed Shim and GRUB bootloaders for this system. UEFI Secure Boot might not be available."
+    [ "$output" = "$expected_output" ]
+}
+
+@test "Skip upgrading Shim and GRUB if the system is not Debian 10" {
+    # shellcheck disable=SC2034
+    OS_VERSION=11
+
+    run source "$REAR_SHARE_DIR/finalize/COVE/Debian/620_upgrade_bootloaders.sh"
+    [ "$status" -eq 0 ]
+
+    local expected_output=""
+    [ "$output" = "$expected_output" ]
+}
+
+@test "Skip upgrading Shim and GRUB if the system is not EFI" {
+    # shellcheck disable=SC2034
+    USING_UEFI_BOOTLOADER=no
+
+    run source "$REAR_SHARE_DIR/finalize/COVE/Debian/620_upgrade_bootloaders.sh"
+    [ "$status" -eq 0 ]
+
+    local expected_output=""
+    [ "$output" = "$expected_output" ]
+}
+
+@test "Skip upgrading Shim and GRUB on Azure" {
+    function is_cove_in_azure() {
+        true
+    }
+
+    run source "$REAR_SHARE_DIR/finalize/COVE/Debian/620_upgrade_bootloaders.sh"
+    [ "$status" -eq 0 ]
+
+    local expected_output=""
+    [ "$output" = "$expected_output" ]
+}
+
+@test "Skip upgrading Shim and GRUB if the system is EFI stub" {
+    # shellcheck disable=SC2034
+    EFI_STUB=yes
+
+    run source "$REAR_SHARE_DIR/finalize/COVE/Debian/620_upgrade_bootloaders.sh"
+    [ "$status" -eq 0 ]
+
+    local expected_output=""
+    [ "$output" = "$expected_output" ]
+}
+
+@test "Skip upgrading Shim and GRUB if the bootloader is not shim" {
+    # shellcheck disable=SC2034
+    UEFI_BOOTLOADER=/boot/efi/EFI/debian/grubx64.efi
+
+    run source "$REAR_SHARE_DIR/finalize/COVE/Debian/620_upgrade_bootloaders.sh"
+    [ "$status" -eq 0 ]
+
+    local expected_output=""
+    [ "$output" = "$expected_output" ]
+}