Merge pull request #1977 from manugupt1/speed-tests

Split rootless driver tests by network driver and portdriver.

Author: AkihiroSuda

.github/workflows/test.yml

@@ -113,29 +113,42 @@ jobs:
         include:
           - ubuntu: 20.04
             containerd: v1.5.17
+            target: test-integration-rootless
           - ubuntu: 20.04
             containerd: v1.6.16
+            target: test-integration-rootless
           - ubuntu: 22.04
             containerd: v1.6.16
+            target: test-integration-rootless
           - ubuntu: 22.04
             containerd: main
+            target: test-integration-rootless
+          - ubuntu: 20.04
+            containerd: v1.5.17
+            target: test-integration-rootless-port-slirp4netns
+          - ubuntu: 20.04
+            containerd: v1.6.16
+            target: test-integration-rootless-port-slirp4netns
+          - ubuntu: 22.04
+            containerd: v1.6.16
+            target: test-integration-rootless-port-slirp4netns
+          - ubuntu: 22.04
+            containerd: main
+            target: test-integration-rootless-port-slirp4netns
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
+      TEST_TARGET: "${{ matrix.target }}"
     steps:
       - uses: actions/[email protected]
         with:
           fetch-depth: 1
       - name: "Register QEMU (tonistiigi/binfmt)"
         run: docker run --privileged --rm tonistiigi/binfmt --install all
       - name: "Prepare (network driver=slirp4netns, port driver=builtin)"
-        run: DOCKER_BUILDKIT=1 docker build -t test-integration-rootless --target test-integration-rootless --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} .
-      - name: "Test    (network driver=slirp4netns, port driver=builtin)"
-        run: docker run -t --rm --privileged test-integration-rootless
-      - name: "Prepare (network driver=slirp4netns, port driver=slirp4netns)"
-        run: DOCKER_BUILDKIT=1 docker build -t test-integration-rootless-port-slirp4netns --target test-integration-rootless-port-slirp4netns --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} .
-      - name: "Test    (network driver=slirp4netns, port driver=slirp4netns)"
-        run: docker run -t --rm --privileged test-integration-rootless-port-slirp4netns
+        run: DOCKER_BUILDKIT=1 docker build -t ${TEST_TARGET} --target ${TEST_TARGET} --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} .
+      - name: "Test (network driver=slirp4netns, port driver=builtin)"
+        run: docker run -t --rm --privileged ${TEST_TARGET}
 
   cross:
     runs-on: ubuntu-22.04