cr-daily-branch: Actually use Linux 6.1 by default on Arm

Commit 95ee1714750b wasn't effective at changing the default version
of Linux, osstest kept on using "linux-arm-xen".

This time, make osstest use the same revision for both LINUX and
LINUX_ARM, like it was done for "linux*" branches only before.

If for some reason $BASE_TAG_LINUX and $BASE_TAG_LINUX_ARM are
different, this change would be wrong, but there's shouldn't be a need
for them to be different.

Fixes: 95ee1714750b ("ap-common: Switch to Linux 6.1 by default on Arm")
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

diff --git a/ap-common b/ap-common
index eabb85c6a6410f4540fa4218ca60972be6267472..5770d2b1f87c034938320333f6da294f73ff8eaf 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -60,7 +60,7 @@
 : ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git}
 : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git}
 : ${BASE_TAG_LINUX:=tested/linux-6.1}
-: ${BASE_TAG_LINUX_ARM:=tested/linux-6.1}
+: ${BASE_TAG_LINUX_ARM:=${BASE_TAG_LINUX}}
 
 if [ "x${TREE_LINUX}" = x ]; then
        : ${TREE_LINUX:=${BASE_TREE_LINUX}}

diff --git a/cr-daily-branch b/cr-daily-branch
index 6ec3aa623d51d2d500be33da1b553950e38ce68b..23e716e41343c3d6b85916481549a2e8cef9eaee 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -186,16 +186,10 @@ if [ "x$REVISION_LINUX" = x ]; then
         export REVISION_LINUX
 fi
 if [ "x$REVISION_LINUX_ARM" = x ]; then
-    if [ "x$tree" = "xlinux" ] ; then
-       TREE_LINUX_ARM=$TREE_LINUX
-       export TREE_LINUX_ARM
-       REVISION_LINUX_ARM=$REVISION_LINUX
-        export REVISION_LINUX_ARM
-    else
-       determine_version REVISION_LINUX_ARM ${linuxbranch:-linux-arm-xen} \
-               LINUX_ARM
-        export REVISION_LINUX_ARM
-    fi
+    TREE_LINUX_ARM=$TREE_LINUX
+    export TREE_LINUX_ARM
+    REVISION_LINUX_ARM=$REVISION_LINUX
+    export REVISION_LINUX_ARM
 fi
 if [ "x$REVISION_SEABIOS" = x ]; then
     case "$branch" in