From 09f45339414dcc542a8ace4b6f01c8f300ca4337 Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Wed, 8 Jul 2020 14:12:56 +0900
Subject: [PATCH] CI: {v1, v2} -> io.containerd.runc.{v1,v2}

The previous names were confusing because v1 may look like shim API v1 (io.containerd.runtime.v1.linux").
Also, v2 may look like cgroup v2.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 .github/workflows/ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6174582ac..ddbe4f5a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -258,7 +258,7 @@ jobs:
 
     strategy:
       matrix:
-        runtime: [v1]
+        runtime: [io.containerd.runc.v1]
 
     steps:
       - name: Install Go
@@ -324,10 +324,10 @@ jobs:
 
     strategy:
       matrix:
-        runtime: [v1, v2]
+        runtime: [io.containerd.runc.v1, io.containerd.runc.v2]
         runc: [runc, crun]
         exclude:
-          - runtime: v1
+          - runtime: io.containerd.runc.v1
             runc: crun
 
     steps:
@@ -395,7 +395,7 @@ jobs:
       - name: Integration 1
         env:
           GOPROXY: direct
-          TEST_RUNTIME: io.containerd.runc.${{ matrix.runtime }}
+          TEST_RUNTIME: ${{ matrix.runtime }}
           RUNC_FLAVOR: ${{ matrix.runc }}
         run: |
           sudo GOPATH=$GOPATH GOPROXY=$GOPROXY TEST_RUNTIME=$TEST_RUNTIME RUNC_FLAVOR=$RUNC_FLAVOR make integration EXTRA_TESTFLAGS=-no-criu TESTFLAGS_RACE=-race
@@ -405,7 +405,7 @@ jobs:
       - name: Integration 2
         env:
           GOPROXY: direct
-          TEST_RUNTIME: io.containerd.runc.${{ matrix.runtime }}
+          TEST_RUNTIME: ${{ matrix.runtime }}
           RUNC_FLAVOR: ${{ matrix.runc }}
         run: |
           sudo GOPATH=$GOPATH GOPROXY=$GOPROXY TEST_RUNTIME=$TEST_RUNTIME RUNC_FLAVOR=$RUNC_FLAVOR TESTFLAGS_PARALLEL=1 make integration EXTRA_TESTFLAGS=-no-criu
@@ -413,7 +413,7 @@ jobs:
 
       - name: CRI test
         env:
-          TEST_RUNTIME: io.containerd.runc.${{ matrix.runtime }}
+          TEST_RUNTIME: ${{ matrix.runtime }}
         run: |
           sudo mkdir -p /etc/containerd
           sudo bash -c "cat > /etc/containerd/config.toml <<EOF