From 83323504a65cbf5ca724f47715eb1eaac3617abb Mon Sep 17 00:00:00 2001
From: Daniel Hilst <392820+dhilst@users.noreply.github.com>
Date: Thu, 16 Jul 2026 22:37:49 -0300
Subject: [PATCH] Fix GitHub CI: use noble image + latest/noble xcat-dep

The xcat-dep APT repo now publishes only the noble (24.04) codename at
.../apt/latest/xcat-dep; the bionic/devel dist no longer exists, so
install_xcat failed on apt-get update/install. Run the workflow on
ubuntu-24.04 and point the apt source at latest/xcat-dep noble main.

Drop the apt-key step: apt-key is removed on Ubuntu 24.04 and the legacy
apt.key is gone from the xcat-dep dir; the repo already installs via
allow-insecure-repositories/allow-unauthenticated.
---
 .github/workflows/xcat_test.yml | 2 +-
 github_action_xcat_test.pl      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/xcat_test.yml b/.github/workflows/xcat_test.yml
index a021c08a6..736357bc2 100644
--- a/.github/workflows/xcat_test.yml
+++ b/.github/workflows/xcat_test.yml
@@ -2,7 +2,7 @@ name: xcat_test
 on: [pull_request, workflow_dispatch]
 jobs:
   xcat_pr_test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v6
diff --git a/github_action_xcat_test.pl b/github_action_xcat_test.pl
index 74b3f8da8..ec78b8f0d 100644
--- a/github_action_xcat_test.pl
+++ b/github_action_xcat_test.pl
@@ -307,9 +307,8 @@ sub install_xcat{
 
     my @cmds = ("sudo ./mklocalrepo.sh",
                "sudo chmod 777 /etc/apt/sources.list",
-               "sudo echo \"deb [arch=amd64 allow-insecure=yes] http://xcat.org/files/xcat/repos/apt/devel/xcat-dep bionic main\" >> /etc/apt/sources.list",
-               "sudo echo \"deb [arch=ppc64el allow-insecure=yes] http://xcat.org/files/xcat/repos/apt/devel/xcat-dep bionic main\" >> /etc/apt/sources.list",
-               "sudo wget -q -O - \"http://xcat.org/files/xcat/repos/apt/apt.key\" | sudo apt-key add -",
+               "sudo echo \"deb [arch=amd64 allow-insecure=yes] http://xcat.org/files/xcat/repos/apt/latest/xcat-dep noble main\" >> /etc/apt/sources.list",
+               "sudo echo \"deb [arch=ppc64el allow-insecure=yes] http://xcat.org/files/xcat/repos/apt/latest/xcat-dep noble main\" >> /etc/apt/sources.list",
                "sudo apt-get -qq --allow-insecure-repositories update");
     chdir $ENV{RUNNER_WORKSPACE};;