Merge 5257610608 into b7c059886c

.github/workflows/.test.yml

@@ -340,7 +340,7 @@ jobs:
           echo ${{ steps.tests.outputs.matrix }}
 
   integration-cli:
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
     continue-on-error: ${{ github.event_name != 'pull_request' }}
     timeout-minutes: 120
     needs:
@@ -348,6 +348,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - ubuntu-20.04
+          - ubuntu-22.04
         test: ${{ fromJson(needs.integration-cli-prepare.outputs.matrix) }}
     steps:
       -

hack/make/.integration-daemon-start

@@ -72,12 +72,6 @@ if [ "$DOCKER_EXPERIMENTAL" ]; then
 fi
 
 dockerd="dockerd"
-if [ -f "/sys/fs/cgroup/cgroup.controllers" ]; then
-	if [ -z "$TEST_IGNORE_CGROUP_CHECK" ] && [ -z "$TEST_SKIP_INTEGRATION_CLI" ]; then
-		echo >&2 '# cgroup v2 requires TEST_SKIP_INTEGRATION_CLI to be set'
-		exit 1
-	fi
-fi
 
 if [ -n "$DOCKER_ROOTLESS" ]; then
 	if [ -z "$TEST_SKIP_INTEGRATION_CLI" ]; then