katatestutils: Use the configured virtiofs daemon path

[c3d]

The current path is hardcoded as follows:
virtio_fs_daemon = "/path/to/virtiofsd"

Switch to using the value of config.VirtioFSDaemon instead.

Fixes: #2686

Signed-off-by: Christophe de Dinechin dinechin@redhat.com

[fidencio]

lgtm!

[fidencio]

/test

[grahamwhaley]

CIs bombed - probably an easy code fix?

17:48:23 INFO: Running 'go test' as current user on package 'github.com/kata-containers/runtime/cli' with flags '-v -race -timeout 30s'
17:48:24 # github.com/kata-containers/runtime/pkg/katatestutils
17:48:24 pkg/katatestutils/utils.go:68:32: config.VirtioFSDaemon undefined (type RuntimeConfigOptions has no field or method VirtioFSDaemon)
17:48:49 FAIL	github.com/kata-containers/runtime/cli [build failed]

[fidencio]

Yeah, I see the issue: We can only point to values defined here: https://github.com/kata-containers/runtime/blob/master/pkg/katatestutils/utils.go#L11

So, we'd have to define the variable there as part of this patch.

@c3d, could you address this issue? ^

The reason I think it was as it was is because it's this path is never ever used in the tests? In any case, still worth to fix.

[fidencio]

/test-ubuntu

[fidencio]

13:20:33 --- FAIL: TestConfigLoadConfiguration (0.00s)

expected:
VirtioFSDaemon: /tmp/kata-222390771/load-config-579229878/test/virtiofsd

got:
VirtioFSDaemon: /path/to/virtiofsd

And the same happens for

13:20:33 --- FAIL: TestConfigLoadConfigurationFailBrokenSymLink

And for

13:20:33 --- FAIL: TestConfigLoadConfigurationFailSymLinkLoop (0.00s)

[fidencio]

@c3d, here it should be virtioFSdaemon, as that's the naming used above in this file.

Here's a log of travis, which didn't return back to us, pointing to this error:
https://travis-ci.org/github/kata-containers/runtime/jobs/695051557#L1070

[c3d]

Retrying 😄

[fidencio]

Travis has passed, but results were not reported back:
https://travis-ci.org/github/kata-containers/runtime/builds/695129068

[fidencio]

/test-ubuntu

[codecov]

Codecov Report

Merging #2687 into master will increase coverage by 6.12%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #2687      +/-   ##
==========================================
+ Coverage   45.55%   51.67%   +6.12%     
==========================================
  Files         118      118              
  Lines       17283    18960    +1677     
==========================================
+ Hits         7873     9798    +1925     
+ Misses       8533     8020     -513     
- Partials      877     1142     +265     

[fidencio]

I'm closing and re-opening this PR with the hope that it'll bring us the travis results.

[fidencio]

/test-ubuntu

[fidencio]

/test-ubuntu

[fidencio]

/test-vfio

[fidencio]

/test-arm

[fidencio]

/test-power

[fidencio]

/test-clh

[jodh-intel]

Thanks @c3d.

lgtm

[fidencio]

jenkins-ubuntu-18-04-vfio:
@devimc, same error as in #2685 (comment)

08:49:03 + ssh_vm 'sudo /home/jenkins/run.sh'
08:49:03 + cmd='sudo /home/jenkins/run.sh'
08:49:03 + ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i /tmp/kata-containers/vfio-test/key -p 10022 jenkins@127.0.15.1 'sudo /home/jenkins/run.sh'
08:49:03 ++ handle_error 260
08:49:03 ++ local exit_code=255
08:49:03 ++ local line_number=260
08:49:03 ++ echo 'Failed at 260: ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i "${ssh_key_file}" -p "${vm_port}" "${USER}@${vm_ip}" "${cmd}"'
08:49:03 Failed at 260: ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i "${ssh_key_file}" -p "${vm_port}" "${USER}@${vm_ip}" "${cmd}"
08:49:03 ++ exit 255
08:49:03 + cleanup
08:49:03 + sudo killall -9 qemu-system-x86_64
08:49:03 Build step 'Execute shell' marked build as failure

It doesn't look related to this patch.

[devimc]

thanks @fidencio , I have filed an issue kata-containers/tests#2628