From f115ae985a399ddce060f448097b8068450a8f48 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Thu, 15 Jul 2021 14:28:03 +0000 Subject: pkg/mgrconfig: make dashboard_key unnecessary Update mgrconfig tests so that they properly test manager configuration. Add dummy files to the testdata directory so that it looks like a real syzkaller folder. Adjust gce1.cfg to test the situation when there dashboard_client is not accompanied by dashboard_key. Make dashboard_key unnecessary. --- pkg/mgrconfig/testdata/disk.raw | 0 pkg/mgrconfig/testdata/gce1.cfg | 5 +++-- pkg/mgrconfig/testdata/gce2.cfg | 5 ++--- pkg/mgrconfig/testdata/qemu.cfg | 5 ++--- pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-execprog | 0 pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-executor | 0 pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-fuzzer | 0 pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-execprog.exe | 0 pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-executor.exe | 0 pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-fuzzer.exe | 0 pkg/mgrconfig/testdata/wheezy.img | 0 11 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 pkg/mgrconfig/testdata/disk.raw create mode 100644 pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-execprog create mode 100644 pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-executor create mode 100644 pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-fuzzer create mode 100644 pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-execprog.exe create mode 100644 pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-executor.exe create mode 100644 pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-fuzzer.exe create mode 100644 pkg/mgrconfig/testdata/wheezy.img (limited to 'pkg/mgrconfig/testdata') diff --git a/pkg/mgrconfig/testdata/disk.raw b/pkg/mgrconfig/testdata/disk.raw new file mode 100644 index 000000000..e69de29bb diff --git a/pkg/mgrconfig/testdata/gce1.cfg b/pkg/mgrconfig/testdata/gce1.cfg index 805a1f418..63320cd93 100644 --- a/pkg/mgrconfig/testdata/gce1.cfg +++ b/pkg/mgrconfig/testdata/gce1.cfg @@ -5,11 +5,12 @@ "target": "windows/amd64", "http": ":10000", "workdir": "/workdir", - "syzkaller": "/syzkaller", - "sshkey": "/syzkaller_id_rsa", + "syzkaller": "./testdata/syzkaller", "ssh_user": "syzkaller", "procs": 8, "type": "gce", + "dashboard_client": "client", + "dashboard_addr": "127.0.0.1", "vm": { "count": 10, "machine_type": "n1-highcpu-2", diff --git a/pkg/mgrconfig/testdata/gce2.cfg b/pkg/mgrconfig/testdata/gce2.cfg index cf9a620f2..40ef21272 100644 --- a/pkg/mgrconfig/testdata/gce2.cfg +++ b/pkg/mgrconfig/testdata/gce2.cfg @@ -3,9 +3,8 @@ "target": "linux/amd64", "http": ":10000", "workdir": "/workdir", - "syzkaller": "/syzkaller", - "image": "/local/path/to/disk.raw", - "sshkey": "/syzkaller_id_rsa", + "syzkaller": "./testdata/syzkaller", + "image": "./testdata/disk.raw", "ssh_user": "syzkaller", "procs": 8, "type": "gce", diff --git a/pkg/mgrconfig/testdata/qemu.cfg b/pkg/mgrconfig/testdata/qemu.cfg index f390537fd..c86ecf6aa 100644 --- a/pkg/mgrconfig/testdata/qemu.cfg +++ b/pkg/mgrconfig/testdata/qemu.cfg @@ -3,9 +3,8 @@ "http": "myhost.com:56741", "workdir": "/syzkaller/workdir", "kernel_obj": "/linux/", - "image": "/linux_image/wheezy.img", - "sshkey": "/linux_image/ssh/id_rsa", - "syzkaller": "/syzkaller", + "image": "./testdata/wheezy.img", + "syzkaller": "./testdata/syzkaller", "disable_syscalls": ["keyctl", "add_key", "request_key"], "suppressions": ["some known bug"], "procs": 4, diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-execprog b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-execprog new file mode 100644 index 000000000..e69de29bb diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-executor b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-executor new file mode 100644 index 000000000..e69de29bb diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-fuzzer b/pkg/mgrconfig/testdata/syzkaller/bin/linux_amd64/syz-fuzzer new file mode 100644 index 000000000..e69de29bb diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-execprog.exe b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-execprog.exe new file mode 100644 index 000000000..e69de29bb diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-executor.exe b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-executor.exe new file mode 100644 index 000000000..e69de29bb diff --git a/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-fuzzer.exe b/pkg/mgrconfig/testdata/syzkaller/bin/windows_amd64/syz-fuzzer.exe new file mode 100644 index 000000000..e69de29bb diff --git a/pkg/mgrconfig/testdata/wheezy.img b/pkg/mgrconfig/testdata/wheezy.img new file mode 100644 index 000000000..e69de29bb -- cgit mrf-deployment