test: remove affinity-toleration legacy parts and config

Signed-off-by: Roman Sysoev <roman.sysoev@flant.com>

Author: Roman Sysoev

test/e2e/default_config.yaml

@@ -10,7 +10,6 @@ clusterTransport:
 helperImages:
   curlImage: "curlimages/curl"
 testData:
-  affinityToleration: "/tmp/testdata/affinity-toleration"
   complexTest: "/tmp/testdata/complex-test"
   diskResizing: "/tmp/testdata/disk-resizing"
   imageHotplug: "/tmp/testdata/image-hotplug"

test/e2e/internal/config/config.go

@@ -80,6 +80,7 @@ type Config struct {
 }
 
 type TestData struct {
+<<<<<<< HEAD
 	AffinityToleration string `yaml:"affinityToleration"`
 	ComplexTest        string `yaml:"complexTest"`
 	DiskResizing       string `yaml:"diskResizing"`
@@ -91,6 +92,19 @@ type TestData struct {
 	VdSnapshots        string `yaml:"vdSnapshots"`
 	Sshkey             string `yaml:"sshKey"`
 	SSHUser            string `yaml:"sshUser"`
+=======
+	ComplexTest       string `yaml:"complexTest"`
+	DiskResizing      string `yaml:"diskResizing"`
+	ImageHotplug      string `yaml:"imageHotplug"`
+	VMLabelAnnotation string `yaml:"vmLabelAnnotation"`
+	VMMigration       string `yaml:"vmMigration"`
+	VMMigrationCancel string `yaml:"vmMigrationCancel"`
+	VMEvacuation      string `yaml:"vmEvacuation"`
+	VMVersions        string `yaml:"vmVersions"`
+	VdSnapshots       string `yaml:"vdSnapshots"`
+	Sshkey            string `yaml:"sshKey"`
+	SSHUser           string `yaml:"sshUser"`
+>>>>>>> ca7478180 (test: remove affinity-toleration legacy parts and config)
 }
 
 type StorageClass struct {