Upgrade icc builder to Ubuntu 22.04

constants.py

@@ -89,6 +89,7 @@
         'amd64-ubuntu-2204-debug-ps',
         'amd64-ubuntu-2204-valgrind',
         'amd64-ubuntu-2204-clang14-asan',
+        'amd64-ubuntu-2204-icc',
         'amd64-windows',
         'amd64-windows-packages',
         'ppc64le-centos-stream8',

master-docker-nonstandard/master.cfg

@@ -210,7 +210,7 @@ for w_name in ['ns-x64-bbw']:
         jobs = 7
         addWorker(w_name, i, '-aocc-debian-11', "quay.io/mariadb-foundation/bb-worker:debian11-aocc", jobs=jobs, save_packages=False)
         addWorker(w_name, i, '-asan-ubuntu-2204', "quay.io/mariadb-foundation/bb-worker:ubuntu22.04", jobs=jobs, save_packages=False)
-        addWorker(w_name, i, '-icc-ubuntu-1804', "quay.io/mariadb-foundation/bb-worker:ubuntu18.04-icc", jobs=jobs, save_packages=False)
+        addWorker(w_name, i, '-icc-ubuntu-2204', "quay.io/mariadb-foundation/bb-worker:ubuntu22.04-icc", jobs=jobs, save_packages=False)
         addWorker(w_name, i, '-ubuntu-2004', "quay.io/mariadb-foundation/bb-worker:ubuntu20.04", jobs=jobs, save_packages=True)
 
 ## Add Valgrind to more powerful machhines
@@ -610,7 +610,7 @@ c['builders'] = []
 c['builders'].append(
     util.BuilderConfig(name="amd64-debian-11-aocc",
       workernames=workers["ns-x64-bbw-docker-aocc-debian-11"],
-      tags=["Ubuntu", "quick", "icc", "icpc"],
+      tags=["Ubuntu", "quick", "aocc"],
       collapseRequests=True,
       nextBuild=nextBuild,
       canStartBuild=canStartBuild,
@@ -627,8 +627,8 @@ c['builders'].append(
       factory=f_quick_build))
 
 c['builders'].append(
-    util.BuilderConfig(name="amd64-ubuntu-1804-icc",
-      workernames=workers["ns-x64-bbw-docker-icc-ubuntu-1804"],
+    util.BuilderConfig(name="amd64-ubuntu-2204-icc",
+      workernames=workers["ns-x64-bbw-docker-icc-ubuntu-2204"],
       tags=["Ubuntu", "quick", "icc", "icpc"],
       collapseRequests=True,
       nextBuild=nextBuild,