Merge branch 'release/4.5.0' into master

pantarei · Sep 2, 2020 · 271e410 · 271e410
2 parents 80490f5 + fceaae1
commit 271e410
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -18,9 +18,9 @@
   remote_user: root
   become: true
   tasks:
-    - name: kata --version
+    - name: /opt/kata/bin/kata-runtime --version
       environment:
         PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      command: kata --version
+      command: /opt/kata/bin/kata-runtime --version
       register: result
       changed_when: result is not succeeded
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -82,8 +82,8 @@
       && mkdir -p /opt/kata
     cd /opt/kata
     TMP_DIR="$(mktemp -d)" \
-      && tar -x -C $TMP_DIR -f {{ kata_download.dest }} --strip-components=1 \
-      && cp -rfT $TMP_DIR/kata/* . \
+      && tar -x -C $TMP_DIR -f {{ kata_download.dest }} --strip-components=3 \
+      && cp -rfT $TMP_DIR/ . \
       && rm -rf $TMP_DIR
   args:
     executable: "/bin/bash"