Ubuntu 22 support

.gitlab-ci.yml

@@ -27,22 +27,21 @@ do-nightly-clean-ubuntu18:
   <<: *do-nightly-clean
   tags:
     - ubuntu18
-  variables:
-    OS: 'ubuntu18'  
 
-do-nightly-clean-ubuntu16:
+do-nightly-clean-ubuntu20:
   <<: *do-nightly-clean
   tags:
-    - ubuntu16
-  variables:
-    OS: 'ubuntu16'  
+    - ubuntu18
+
+do-nightly-clean-ubuntu22:
+  <<: *do-nightly-clean
+  tags:
+    - ubuntu22
 
 do-nightly-clean-centos76:
   <<: *do-nightly-clean
   tags:
     - centos76
-  variables:
-    OS: 'centos76'  
 
 
 #
@@ -62,23 +61,21 @@ do-build-ubuntu18:
   <<: *do-build
   tags:
     - ubuntu18
-  variables:
-    OS: 'ubuntu18'  
 
+do-build-ubuntu20:
+  <<: *do-build
+  tags:
+    - ubuntu20
 
-do-build-ubuntu16:
+do-build-ubuntu22:
   <<: *do-build
   tags:
-    - ubuntu16
-  variables:
-    OS: 'ubuntu16'  
+    - ubuntu22
 
 do-build-centos76:
   <<: *do-build
   tags:
     - centos76
-  variables:
-    OS: 'centos76'  
 
 
 #
@@ -91,10 +88,15 @@ do-build-centos76:
   script:
     - ./cicd_tests/test-p1.sh
 
-test-p1-ubuntu16:
+test-p1-ubuntu22:
+  <<: *test-p1
+  tags:
+    - ubuntu22
+
+test-p1-ubuntu20:
   <<: *test-p1
   tags:
-    - ubuntu16
+    - ubuntu20
 
 test-p1-ubuntu18:
   <<: *test-p1