Merge pull request #7964 from glekner/test-vm-cloudinit-string

Bug 1921644: [e2e][automation] tests errors with wrong cloudInit new line syntax
openshift · Jan 29, 2021 · 08f33c8 · 08f33c8
2 parents 1e13436 + bbbda8f
commit 08f33c8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/mocks/mocks.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/mocks/mocks.ts
@@ -113,7 +113,7 @@ export const getDiskToCloneFrom = (): Disk => {
   };
 };
 
-export const cloudInitScript = `#cloud-config\nuser: cloud-user\npassword: atomic\nchpasswd: {expire: False}\nhostname: vm-${testName}`;
+export const cloudInitScript = `#cloud-config\\nuser: cloud-user\\npassword: atomic\\nchpasswd: {expire: False}\\nhostname: vm-${testName}`;
 
 export const defaultPodNetworkingInterface = {
   name: 'default',

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/vm.detail.base.scenario.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/vm.detail.base.scenario.ts
@@ -14,7 +14,7 @@ import { ProvisionSource } from './utils/constants/enums/provisionSource';
 
 describe('Kubevirt VM details tab', () => {
   const vmName = `vm-${testName}`;
-  const cloudInit = `#cloud-config\nuser: cloud-user\npassword: atomic\nchpasswd: {expire: False}`;
+  const cloudInit = `#cloud-config\\nuser: cloud-user\\npassword: atomic\\nchpasswd: {expire: False}`;
   const serviceCommon = { name: vmName, kind: 'vm', type: 'NodePort', namespace: testName };
   const testVM = getVMManifest(ProvisionSource.CONTAINER, testName, vmName, cloudInit);
   const vm = new VirtualMachine(testVM.metadata);
@@ -60,7 +60,7 @@ describe('Kubevirt VM details tab', () => {
       profile: Workload.DESKTOP.toLowerCase(),
       template: NOT_AVAILABLE,
       bootOrder: ['rootdisk (Disk)', 'nic-0 (NIC)', 'cloudinitdisk (Disk)'],
-      flavorConfig: 'Tiny: 1 vCPU, 1 GiB Memory',
+      flavorConfig: 'Tiny: 1 CPU | 1 GiB Memory',
       ip: NOT_AVAILABLE,
       pod: NOT_AVAILABLE,
       node: NOT_AVAILABLE,

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/vm.guest.agent.scenario.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/vm.guest.agent.scenario.ts
@@ -55,7 +55,8 @@ describe('Tests involving guest agent', () => {
     createResource(multusNAD);
 
     // create linux vm
-    const cloudInit = `#cloud-config\nuser: cloud-user\npassword: atomic\nchpasswd: {expire: False}\nruncmd:\n- dnf install -y qemu-guest-agent\n- systemctl start qemu-guest-agent`;
+    const cloudInit =
+      '#cloud-config\\nuser: cloud-user\\npassword: atomic\\nchpasswd: {expire: False}\\nruncmd:\\n- dnf install -y qemu-guest-agent\\n- systemctl start qemu-guest-agent';
     const testVM = getVMManifest(ProvisionSource.CONTAINER, testName, VM_LINUX_NAME, cloudInit);
     vmLinux = new VirtualMachine(testVM.metadata);
     createResource(testVM);

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/vm.tab.dashboard.scenario.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/vm.tab.dashboard.scenario.ts
@@ -19,7 +19,7 @@ import * as dashboardView from '../views/dashboard.view';
 import { ProvisionSource } from './utils/constants/enums/provisionSource';
 
 describe('Kubevirt VM dashboard tab', () => {
-  const cloudInit = `#cloud-config\nuser: cloud-user\npassword: atomic\nchpasswd: {expire: False}\nruncmd:\n- dnf install -y qemu-guest-agent\n- systemctl start qemu-guest-agent`;
+  const cloudInit = `#cloud-config\\nuser: cloud-user\\npassword: atomic\\nchpasswd: {expire: False}\\nruncmd:\\n- dnf install -y qemu-guest-agent\\n- systemctl start qemu-guest-agent`;
   const testVM = getVMManifest(ProvisionSource.CONTAINER, testName, null, cloudInit);
   const vm = new VirtualMachine(testVM.metadata);
 

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/vm.tab.environment.scenario.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/vm.tab.environment.scenario.ts
@@ -26,7 +26,7 @@ describe('Test VM enviromnet tab', () => {
   const configMap = getConfigMap(testName, configmapName);
   const serviceAccount = getServiceAccount(testName, serviceAccountName);
 
-  const cloudInit = `#cloud-config\nuser: fedora\npassword: fedora\nchpasswd: {expire: False}`;
+  const cloudInit = `#cloud-config\\nuser: fedora\\npassword: fedora\\nchpasswd: {expire: False}`;
   const testVM = getVMManifest(ProvisionSource.CONTAINER, testName, null, cloudInit);
   const vm = new VirtualMachine(testVM.metadata);
 

diff --git a/frontend/packages/kubevirt-plugin/integration-tests/tests/vmi.overview.scenario.ts b/frontend/packages/kubevirt-plugin/integration-tests/tests/vmi.overview.scenario.ts
@@ -15,7 +15,7 @@ import { ProvisionSource } from './utils/constants/enums/provisionSource';
 
 describe('Test VMI Details', () => {
   const vmiName = `vmi-${testName}`;
-  const cloudInit = `#cloud-config\nuser: cloud-user\npassword: atomic\nchpasswd: {expire: False}`;
+  const cloudInit = `#cloud-config\\nuser: cloud-user\\npassword: atomic\\nchpasswd: {expire: False}`;
   const serviceCommon = { name: vmiName, kind: 'vmi', type: 'NodePort', namespace: testName };
   const testVMI = getVMIManifest(ProvisionSource.CONTAINER, testName, vmiName, cloudInit);
   const vmi = new VirtualMachineInstance(testVMI.metadata);