Run tests against zfs-kvm

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>

.github/workflows/eden.yml

@@ -11,6 +11,10 @@ on:
 jobs:
   integration:
     runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        hv: ["kvm", "zfs-kvm"]
     if: ${{ github.event.review.state == 'approved' || github.ref == 'refs/heads/master' }}
     steps:
       - name: Check
@@ -44,12 +48,12 @@ jobs:
           TAG: pr${{ github.event.pull_request.number }}
           CACHE: evebuild/danger
         run: |
-          if docker pull "$CACHE:$TAG-kvm"; then
-             docker tag  "$CACHE:$TAG-kvm" "lfedge/eve:$TAG-kvm"
-             docker tag  "$CACHE:$TAG-kvm" "lfedge/eve:$TAG-kvm-amd64"
+          if docker pull "$CACHE:$TAG-${{ matrix.hv }}"; then
+             docker tag  "$CACHE:$TAG-${{ matrix.hv }}" "lfedge/eve:$TAG-${{ matrix.hv }}"
+             docker tag  "$CACHE:$TAG-${{ matrix.hv }}" "lfedge/eve:$TAG-${{ matrix.hv }}-amd64"
           else
              make -C eve V=1 pkgs
-             make -C eve V=1 ROOTFS_VERSION="$TAG" HV=kvm eve
+             make -C eve V=1 ROOTFS_VERSION="$TAG" HV=${{ matrix.hv }} eve
              IMAGES="$(docker images -f reference="lfedge/eve-*" -q)"
              IMAGES="$IMAGES $(docker images -f reference="eve-build-*" -q)"
              IMAGES="$IMAGES $(docker images -f reference="golang" -q)"
@@ -66,6 +70,7 @@ jobs:
       - name: run
         run: |
           ./eden config set default --key eve.tag --value="$TAG"
+          ./eden config set default --key eve.hv --value="${{ matrix.hv }}"
           ./eden config set default --key=eve.accel --value=false
           ./eden config set default --key=eve.cpu --value=2
           ./eden config set default --key=eden.tests --value=${{ github.workspace }}/eve/tests/eden
@@ -104,7 +109,7 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v2
         with:
-          name: 'eden-report'
+          name: eden-report-${{ matrix.hv }}
           path: |
             ${{ github.workspace }}/trace.log
             ${{ github.workspace }}/info.log

tests/eden/update_eve_image/testdata/revert_eve_image_update.txt

@@ -18,7 +18,7 @@ eden controller edge-node update --config timer.test.baseimage.update=30
 
 # Download EVE rootfs into eve-dist
 message 'EVE image download'
-eden -t 10m utils download eve-rootfs --eve-tag={{$eve_ver}} --eve-hv={{EdenConfig "eve.hv"}} --downloader-dist={{EdenConfigPath "eve.dist"}} -v debug
+eden -t 10m utils download eve-rootfs --eve-tag={{$eve_ver}} --eve-hv={{$eve_hv}} --downloader-dist={{EdenConfigPath "eve.dist"}} -v debug
 
 # Check stdout of previous command. Expected to get full path to squashfs
 stdout '{{EdenConfigPath "eve.dist"}}/rootfs-{{ $short_version }}.squashfs'

tests/eden/update_eve_image/testdata/update_eve_image_http.txt

@@ -1,14 +1,15 @@
 # Default EVE version to update
-{{$eve_ver := "6.4.0"}}
+{{$eve_ver := "7.4.0"}}
 
 # Obtain EVE version from environment variable EVE_VERSION
 {{$env := EdenGetEnv "EVE_VERSION"}}
 
 # If environment variable EVE_VERSION set, use it instead of default
 {{if $env}}{{$eve_ver = $env}}{{end}}
 
-# Obtain eve.hv from config
-{{$eve_hv := EdenConfig "eve.hv"}}
+# We want to test update logic of current image
+# Will use predefined HV
+{{$eve_hv := "kvm"}}
 
 # Obtain eve.arch from config
 {{$eve_arch := EdenConfig "eve.arch"}}
@@ -24,7 +25,7 @@ eden controller edge-node update --config timer.test.baseimage.update=30
 
 # Download EVE rootfs into eve-dist
 message 'EVE image download'
-eden -t 10m utils download eve-rootfs --eve-tag={{$eve_ver}} --eve-hv={{EdenConfig "eve.hv"}} --downloader-dist={{EdenConfigPath "eve.dist"}} -v debug
+eden -t 10m utils download eve-rootfs --eve-tag={{$eve_ver}} --eve-hv={{$eve_hv}} --downloader-dist={{EdenConfigPath "eve.dist"}} -v debug
 
 # Check stdout of previous command. Expected to get full path to squashfs
 stdout '{{EdenConfigPath "eve.dist"}}/rootfs-{{ $short_version }}.squashfs'

tests/eden/update_eve_image/testdata/update_eve_image_oci.txt

@@ -1,14 +1,15 @@
 # Default EVE version to update
-{{$eve_ver := "6.5.0"}}
+{{$eve_ver := "7.5.0"}}
 
 # Obtain EVE version from environment variable EVE_VERSION
 {{$env := EdenGetEnv "EVE_VERSION"}}
 
 # If environment variable EVE_VERSION set, use it instead of default
 {{if $env}}{{$eve_ver = $env}}{{end}}
 
-# Obtain eve.hv from config
-{{$eve_hv := EdenConfig "eve.hv"}}
+# We want to test update logic of current image
+# Will use predefined HV
+{{$eve_hv := "kvm"}}
 
 # Obtain eve.arch from config
 {{$eve_arch := EdenConfig "eve.arch"}}