Jenkins, GHA: use Ubuntu 22.04 agents

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

Jenkinsfile

@@ -21,17 +21,14 @@ def pkgs = [
 ]
 
 def genBuildStep(LinkedHashMap pkg, String arch) {
-    def nodeLabel = "linux&&${arch}"
+    def nodeLabel = "ubuntu-2204 && linux && ${arch}"
     def platform = ""
     def branch = env.CHANGE_TARGET ?: env.BRANCH_NAME
 
     if (arch == 'armhf') {
         // Running armhf builds on EC2 requires --platform parameter
         // Otherwise it accidentally pulls armel images which then breaks the verify step
         platform = "--platform=linux/${arch}"
-        nodeLabel = "${nodeLabel}&&ubuntu"
-    } else {
-        nodeLabel = "${nodeLabel}&&ubuntu-2004"
     }
     return { ->
         wrappedNode(label: nodeLabel, cleanWorkspace: true) {
@@ -58,7 +55,7 @@ def genBuildStep(LinkedHashMap pkg, String arch) {
 
 def build_package_steps = [
     'static-linux': { ->
-        wrappedNode(label: 'ubuntu-2004 && x86_64', cleanWorkspace: true) {
+        wrappedNode(label: 'ubuntu-2204 && x86_64', cleanWorkspace: true) {
             stage("static-linux") {
                 // This is just a "dummy" stage to make the distro/arch visible
                 // in Jenkins' BlueOcean view, which truncates names....
@@ -79,7 +76,7 @@ def build_package_steps = [
         }
     },
     'cross-mac': { ->
-        wrappedNode(label: 'ubuntu-2004 && x86_64', cleanWorkspace: true) {
+        wrappedNode(label: 'ubuntu-2204 && x86_64', cleanWorkspace: true) {
             stage("cross-mac") {
                 // This is just a "dummy" stage to make the distro/arch visible
                 // in Jenkins' BlueOcean view, which truncates names....
@@ -100,7 +97,7 @@ def build_package_steps = [
         }
     },
     'cross-win': { ->
-        wrappedNode(label: 'ubuntu-2004 && x86_64', cleanWorkspace: true) {
+        wrappedNode(label: 'ubuntu-2204 && x86_64', cleanWorkspace: true) {
             stage("cross-win") {
                 // This is just a "dummy" stage to make the distro/arch visible
                 // in Jenkins' BlueOcean view, which truncates names....