Optimize installation steps on CI (vmware-archive#1313)

shuklanirdesh82 · Jun 3, 2017 · ac68736 · ac68736
1 parent 43f26c0
commit ac68736
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/.drone.sec b/.drone.sec
@@ -1 +1 @@
-eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.UpFXAXcCoNucXeMCDZwX6dJCZZt2yTqlLH0UdUsSbdWRIq0GePukVaFn67-sK9eh_v4VHQvh2VQ7sYcPq4k7sYQERlQjlDphLXakJykzeFiLG6or5jf7QT2aESh0s1Jw5vpdcPqmHf1323BBEO0phwIJQXK0DxK58z-KV7YJisiSyLjaPTSpLQmTH0g8rzJTWPid3qUaaJGKzq84ZMDkQ_bXYhUKDLTLDFNmVDs-VoZTWZ8eZSPkVPUSlHF9Lvwnuf3_0KbGyDiZsJsvx54lf46joSXrlaBGozl35MSYpUftAveGcc2iU0NY84TQHUonnuFnjn2kLXBhOoJV1cib3w.2Nwk2WTqmzTpFs_O.EjIOt2ug5lXKw3rsnrT3u7o9k_tlaTwTvE1gaqubTTuU2EIAq_wvIX2gzM_4ACFLTQJGSLiCqnpBRAegkpH-3TD7r-p2F92j1eUKu9k6jb6Yzx0eQXa4Mju3G9CDB_JPfUDi_PY6w1RDhw2ODZ6-5lw7xTg6X6jz4JvV9Vf6tJls0MrIH0cUmKmWTkWtqv_ZghOQHipbajmUeBJmsAdK3s3wX8vSddwvLdKtbuuPR0LsncR2llDYoTxApWEgOBljASrPuFV94l8OANC3g4Q4AAwIs5AA_d0SU9DlfhXG2X9XIPHgxsr3sJTr4Oy7K176QnSJAz-odmlovbJDBiTUFqconj72l3MK9jw5IbN5DjgVEweyR7Ya-OdetPe1bdQbxWmWmuSiDdl_LGvg-Z8jsZb5x_Ah7AAQZGqFaW-hQARiEsiB1jor0RrY20JVgUI5AMTZCBhpBpAt1HTbWSG0IHbTbt8lwxEpMlNke7N1EX3oY6sgvoFaf_aTYo_TyfUsSdQhaKD1YYeYODzK6EzqBglZMdSP8EhvlzatP_dzjcwWg-NWjhCS33ii49uq7-wBqmCQ57Ojf_F2Ef0FwhmTYG0ZMWs7Lx-_TmVHSHbKP-JxpoJoEpN1N0cl77N09A4K74wQ7C_tCzn-2wjEysuo-jhFyr6sif2AeDEkOR18rk66iKCDqkdgLXqJfZNFYMK-KPVeIdvJtWpmUIJXUvWYPKIbPvgv-Hwh3do7KVooVF8-rlvG6oSXqD8ki4yoY3WqjXHMfhBVY5zWKus6ZrzsItMcWqgUU3eXGejJ_XSe02vmQrZKfTgNt3velH4nDvgx66V_d04Gt87mztJ9jesrqFFVZQ9O_wQne7kIdOsWO69poKdg7xfgnk0pz8WHeUX-PgyUVwgHFrBWn1ETtgebcmmTW8Zbb6ga0WfLm-CAR-3e5b8rIrWuYs7uWhE8IekC9a3xbuB1iWqFAiUXt-18xlB4D_r2cTrYCJSDjvwlrrZc8E8z4jiRXCSzdGdo0in8LyQsInPtddoUZxE8sXYRNnVUv82wSAgFYgr1HcdUqkyyNxO5YNnqRBpNx8yx3F5jPDwhh8vGyhT8wn0TIOmevgbTLSDLO75zH4lh1OknrHfwx4EMKnCWAusv7ibLsJvnVDZla9lRQLgCpKHPp-s_zxHqMGhF-Z94jLJm89ty4aK3l4euILwcn5Eo7oTMi0nGqE4sYpiDmG53W2g1LlNJdHiRup7CletDzQnHCjPkLgmW-3u6MTGS1265PECl6-t5CPiKgvRNGehY4roQjeoBcUDi5LNg3rztxp3k4e56SbcEraxATCDrL7lj_cX_7GiP0ieVp3PrxoPTiTJWmQtLzvqHSqcxkE1KQZWX9ZDdAKw6FXpntXkiA5rDL4_vx4yTPLZI_Sx6ivrbuCqpoKVX5S34r31kpQGVSs5qVWEiinSWSrkQHuA4qSpdXPAVxE-OP0dUq1k9uwBe-WmvYUTD-6aWzfqdVjcBsHy_SZJdPQRLwzbcl1IhGlvug9YMdbLzcEn7-jB9pg_7EBW9mr-17-xrr2NFlLJtJaMw7DsOEqYGwor4lQa39HeXH1kWBkRt9DJacD3rtCR48ZzGoNau0w1q46eExHwvaKhrmegZZA9PrXoVMtIg1BUUFtHgpRIyrZjX0dAtS-es_2TKzWqWLAP4dAVgoHrevb691aQNoXyIDYICEwPMu3_Oj0tWvMRuT4x1ajqMkmf6JAifPOCFobGu4-aOw-8qUyDUK23CjU-8o8blxsONz9MfXHWMUu2VOzhegQKFqSNp0tvJ_Eq0U7ju6A2Az7oXcbnwuV461sqgCV91Un_xncFLPvKKAnMQ9xea65Jipctx3W1FWfabFqdoGXGRwk0o3eaA_oHbdffGT8GOgJ0xkxA-pNRMBzLCEd7qkBFdTWyTxXN5fVQqiwOCIEeGRgBM0Uy9qkpNz25jlrnfkccYVNND0MpS6m3cNpgpPWRmXWwNu0KlHmPQx33KEr970VT60mdwevy7zeuzMjaOYdnPTZ6oU3s7sPaQ_UoqxzBjIpprB9ML_U8wDhjO0dBVNY3AEzbuFSwDwvlJsO0H8woN41RzVfd0CAZ0Ae5A6YWk5OEKKXRoE89vZF4J8d8bSF4woTJTBCaiBdjA8klgGbs86wtp9RzG0sAsdhTVie8oxA1XCcFijNVaKX5WHS7BINCIZYxuPofEJwQv_gqTu-RfwoBtZYDXgO5H7JNvzVYkGD4bqolJND9NQdSjrEij4DGZgsPVdKHEL15ttOV_KQT10AivCevSZEzXKCkZbS-FhkbNxbYS1xxxNZA1mJeg37duBD12ozd8wy2A8qHohetmr8YeC6CeB6CzhSgxFYUre8QNqel3_PvOd0m2Go2Vwp6J5bzG4CYOycvXESLbNAs9ueCLgf0j4PQKwLDDIvTKRmFo9U0G_mMqAJ6NxaNe-ZiVR89XxPOQsX28cO9I6NkHlR65gQV6ziGJ33130axc5BuEqu8lNHwrxN83-LPoSdsk64wc0etalXSNSK46po2sLkaFVKUQsr07bVYyahY5Gyi_iFCGTMqRCXmrXPyPdY-YV3_bkm0pPUEN5ebv1EjRcRTgie4DXgvoDfT_eWGkaMBeTdEguFnleD_QEpjemj83PuPeRh7hDi5dcQdlicuAX__L2x4X-3Y16D5ZP7IYpbsskSgrVqgCzqdxIeJUmJM8ibdGHbCqhWuqqm9k2QQxjq1ZMBIbNhkckl86vk7afpaTR1dMpMwsB3Alwc-qSJKLhPlzAaXlrZei_cojJ5_lmZQEJhPfQ1EkdcfdFiQUt3ipgdY6AMAbgS3i3mG-eyUTLUKoKDLuB9GzQVdn5P9OZE5BvIr1BYrtr3XF5Gjhm4uMpI4yZF-sD4RaCwtUPGTSc_1-5XeOQwY8yZWdWNnGZsZB74-j_gT64DRDqXGv9naat7vDtZmvp8mgb5HSKI8H3SIWVL02fT6QoPB4dGe-tktW74yY2MxYkJY9p9Ybm7yVtCcHTXQQAfmvIp0h6l5uei_RGS58uqHYbrPZ9PQwcbx_VVdaLyjObusRKwhh3opj_skuVG07L7wfKz6_AfrbEoWgPHFlY_u9W3L_9KchPbgmlMkHDVRIJMoIBte7LLW5glIuF-zpBFs8eNlQV75Sm0gfmn3IY02XQbDmDahrLk4b44uTOi4kvrNW68SeaY_alb8rOzsS5aoynGCRrfS6gflkVo2RB_ahYdrxvXBi41DOIeoSCjZcxIXii2plxLO0jWpKbD9RfgKWOFRMD8jjmUgt2HSuSVXCLMsvFO1gXMdmBLPEZaipxztLNB2hQiZZifIek6DnA0p6fNl_lCjUhSkd7ab80vQGvSgN01VgoFsPREi-PaqBljw7WH6wjK42D1AgW4Ab-BPk8t9S4DJ4SRGxs50Su-Dw-dHNkM2ID2oKqzOv21DnUMFO0J3fEsm0epFCB5ZgLhg_n1v3cGwjiw7-m__mwQS0VNvfeb5kIGJVbPGR9551cVMAnKEvBoUh6zjTeEH-QfK0DBBCBP2HTGgDcl_CUgHgw7EoS0PVfOoVvGK53FRFPmF_2K_USGgDWP1qvY1385H-KPN9p-LzYZD7W6JeCgC0OtYBwkas-Hvb_4mG6oVE0sVLC9I98sgf67IgDV_LwFVa9zIldxnbMOzgHkQiat14B1RtFASkNPnTrw2mNsg-XlMETy2ANEmwPvSZC0Jyk7VdevMlcNNJp3k39M78aOiagcjHs308DHIXBpnh2IbdvLS-0lqf2HTLuAyasOQmqF2hsXOPA7FKXFnOZb6HvhbO5BRSirpZ6okTsU_SgbFHEQbFtgKi0eJ6qE6XVtt_HPX-nDLAwbNWyacaPAiNPB9z1A2fmTfeFZ03Qr4TZ8pUfyAsJSTQ3_yw7eEaV0QgTI4G9c1WBDMlFjGLJiBlZpat9FPgq3jPcpA.pGyBlTvH2ai0IDu5FzSWRw
+eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.AcZirDxpdVFFNvltNw_H_swfaRX4Epc7vLS3smlCzb65b4NFCjRi5tYpzDgLESl0m2Ww78YoYo4b65cxFfOAM803m54j7RYzHyxx7EbX7UXd-FwI8D8kIjK53zcBzzrjgosbgu0gUdScgKSOMvAcW2fsd9TXqSLmA0LNcRj63kr8wFJoyMdf_io-y48EKZIBDlqp3Hx8hN1BoSEOshPzBPxVRMFMPvA7FcCeEjiWyNU8PdX-uJm2o6sfaFRYmwXN8fD0S2hw_lknYwkQnnyH24L4MiSIh-Heq_dXToFE0IcLZtETs90aK1QWVX6r_n5hyNXoxVh0HlJ_QfUMKXdVeA.GhjAYQVp8kXkGAt3.hh7RH2vXi7WF1_zuY8hBUsYlnWI3nRJ-PvtRYuc8tUEAnCJ0d_T7dXFawxAzwJlj_Fpg5c45-g6te5iv4ota0qDt7zQSX0VRPDkfEKt5fdoY5u2tSo8buvrKebGy44AHoh3rE8NqxuKeR9QoV_mqMNcI4xvT_-USuxC1FDUYtMJijwB2Vgr2zzbMaKHq_enFiaEJzFWtx3AjX1dE7L64QXrS2yMngHkk-xr2JYnwFCAuYwCqhatsP3YBvAhrNBYxYOr9osKK_KYuQc7_1iXlLAXaMvITUFe9Gt6f3bfHh1UiNh7gabyyQBaeKMW-hc9-P_0GBbDvkF5HsBEEWd7qTdHXS2xEbRblqALhA8hBbkjt-92M_CeFYg4DSogA8vwkBdQYRTX9ULdumx5Jcwc6btYaQuuDUBVNXkqXDYX-Y1ZQ9jFQwlyWYaRd8HEFYlCrHS4MTJP6-YkA0WX7VCuqANwoiHFvrt-ZG4Hyj64MT4FZ1C_pPvcDHypmddJNYlPIxmbKhu1wt9iKhZOI4EfPX_fjKyDZ64dl1hkMlhbiM01awekWK5FclP-8S7l_tFI7FUffEsBSS4ef81BVKZXUt_aJMCEH5DBb8X6pf8q45DahkY2qANQ_0FM66Eo--HDceTS1tS2PSqMWzmma85NC8r9tHGNgeCtZXaKukxbhzWMw--__PNgTLOcIj5lq7Ozqc9-ufRdNPy6rsQ1OiLMAhzY49ebxLTV7r7tf0igNyB83xH7M07sVStCiLxyKy5JK_0lxJ_E37yXeYw4CdlsR7Zt4EqB80Aa4jzXIBqp9FrvaELVb7LqpLe71VKS30ySbXBgxXJ1m3JjiIQLcTcj1tbGE9UZv6vV0PBQKBbNHbQOOWtBbswmtn_OmUR8nlN9n9t_ANM6gdtIO2I0Bs0TpJdzeabKwqxrLQvd3MIXdMMPqsYL8YXLSEHKDALfJd98S2MFGXyisF47HuTx_EPX-r8Jsiw4nDEPjW0JFwFxs9xSlKNP926TgYoIdu1-cQ59tNK21UrSxB4rydL6C8aGKn_nu1mAvei1BaIwpmWysbW46yuugGYqCnMnZLec7-RfZebPVnnPG38extZe5WPMN8r986XNWJjpx5LFUBmQGWo85uNx3PDtTf4uzYSkaxrlQ09-Qpm0iXpRNq02tOpYYnmPGSzzxPVA2QiG_OM0cvw8160i2iMnjjgKDt5XYl8NWqmrzJ9nhQdjk-Dk6owCsfVQX98FbiBqqLUn6gAar_QqCb7pSJasGb6z5v2MrBdlDsTTpNF7pwBD5g2jT3Ce7Dtp5OtcCGACEfNu6mDrSXTuQVmBTGDT5eWnENQluffaWbI367f1Bo9TduQzn9YP__Q4CLOV3i6HWkJ0mpAIYcYov_u_8Sxz33qmaLt7DU6FDo336jEPvLnL8cDqTfRT2GFjtDU_MoLuRt76RwkXl0BYmzLZYgNgFjxzM2mGavaLsuwecwgQzjCej0rQ2WDsEL0HCE5orOeW98ig7Wgn77IsOoud62nPMc-DM9Imfy5q7UCj-lWnjqIhpouvyHqBU0YzRAb49unpxFsRi2zs97sSajeVb6Vz5SQVMCuTZDyutrtP5yOBLXD0TdYXhvS3KPIiZQVd0AtAHou6_3bD_nmrF9secVQlhNDt-hDSXPynuJhb0n5CVrvpCiTDcA8JiLm9FVP5P6xEiwzTSlvqmfZYLl_yaLJNwssR9FzNCww4OoCWFESwKk8J-ujb0YPgIMLoFyyeZdE5POh0VwWoXVdo1OqdnIi43rToI4hIVWO5789t-NOSRKp2Dg5buJEqEhuw4ldsZMAxRxTqrkVcuf_u7Rf_8fp_rfO1-KsutKHEF6mqmyC-m_oMsPmo3ZFWiDymBO-IPVECLD7DTQ7jubbCm1F7cpeHJnJauVtQzIuhlPdqS74-lwlOYcSAuawraTgEobKUmFCCM4UZzbpy0fKpXjyd1xvEfjGjKqGb4POYQXgR4YR6smjJvL09RLCEFmDSaV-QzzBII1vQ6yEkOwlyr7JhxvK-8FqCe-KArOv-NtWjATg5Q_hyHD_JxYkZ3Gtzto0Mgqm6btTPshBs021k-OdvEwdkh5smFVnpVc-fYxb3f8mqsbU1U9YChnBFYrS23z-SJ5VjO7AFaL9-4AcBbRQdj_bGsIu8md-IfMfr0eJrhGNX6kjehRe3f6_lqt7_BKrBGpicocET8V4ibhC13tvPuE7PY_8n9rasXQOBxZb48mkEMsigT_LRQCzNdCI0bUOwm4W5LpQDUgJkir8aeHmkm8iIjge9DolUZZMetjgX8N7O8p2eWPP6jqsrrJoNfNHVeEf-RWTFrB3MJ9X7UfhP9c4F3QeYV4LS0PsRqmW_pWykShRurBioiHJ0JmcRIZ3SnMxxP6t8cpHspK6SYjACcdxjPW_Qa78WcrC128HaNnZP1L__HEDSKQMmL0_Bao-RIsjSP8iELxVscXLwxink6DVUDYWCjXwef164ifpL8h7lD_kf39NRUCPk5v3D2fzD7Q7OxlCguYfOJpRu3Nb5yLyaAwDFrXjBbz04zJu8Ts3tmPU9L9fXHYnN0q45ISsSNtRIAbDxgxQF35bmpz5diI4zwXHflfyz3mheUdTlkr6kB1YlVNYTDq0NspvprNEXb_vxI3Y0JT_gR5SOG0zCbpepCEMD3N40uccCIhtdIyT6ULG0LvPHs3s3vK-hWJWzoLgMBuovrhjDq-JdCetnPVLNyBR2NwOrJx8JTknAr0K_Y2dCytd5sxFjJHKt9MoA8NyahEs7Cm5iAUFgolUvxpMLoV0G4AYvLfv1vrY2NVPtnkg1tXprT2i25Xn_RgTazL0uLMyETMDCyFYt3TMSlCTr29yD8r8iLpHo-25VAqX_Es5IR1yKHMeNOCxPVUGd28D7_me01KtgCHKS74QJW5KjAVDnh04X3KXSh8adWTRd6KG9EkFFr1ykDNL-LvyvlnwSfJpzdjGKn9Fw-kX-ubl6rYw059g9ThWE5snjvIXQlDXb4J8wRoU7cs20JDk8PDDUpgzJaFb53wEfKP_VC9FRef4oipP_qgMhvCBKg0GlV1_BJXgjZcIsZCyPWHlp_ZoijkaFre2yjf0sJMgCMWWVy-Kv8rhVbdFTwFnJ93NPsclADGQbp6fvph4YFI-xEiouigWN4U1W9ItQb2VlNSkVhcA4KAX9gH5FtIoGeved6c9w9uDDbYFyeztGjhC-QtkpIQuxA3gPKwyjorbiKnDFwXmJWFI2ZVw0-NN0qonTmRULWs18J1XvFGGbadMuk4x3077bU7Ppev1ZTilkkkoBYmctlqUdCkwSlXZ1yuzB17tdQ0dqaUWaIQ_C7EIekOGjdfybutEgxT_m3NqWRxhHTqUuh_TBFwFc3A08-u1sDsPOtJR_kaY5NXRbjDLBh2QEo3PJe81-dGEaRbytQdLh6JzpgpCzpLO5Lqhuazgr1yAyhPb_r02MV0iHF8w4gm-BK5VSTSWDcrg8eiLmHvjZVwORTR9UOO1lX5Cl8gEJr1drngn64zW2p-KxDKW4_E9M1MlKj6y3GlDc5EMHvbMME3QORcxU1Om7qO5RHrbqK7qwd1C6W5_iHqZ-cfRQaa_nBXw-_Kp3K4I8DdvZ3PQ0hRaCNunjseVzJkD1o6vpMIrWRnIL3Y2LQH19OkIk3-qkkr_I8YmYxE4iarUcnAoPddeYM4GxrTvZ-GqSdm3eaCGjiItqzI34r3a7fZt3vaGYISsDVywDSx3iHqg2dxk97FQ8l5J30CfSO8YPtzy5xPL5X3-5rWaIQ2kTIBI_ukehW9FvVUZgq-V3NBme-CRip5L729QZFMB_WoorE53nnDiHdtH5VDjAKphKTJBXMcjlV2xvyRa65ZGrmW-BnXWkES5HCk-Q1Y9liLyynbOIqR_oT-eAud-Yq6xab0iNUJEs2XPg6V2lX6i3ZqrY7mvkWPsc.wYPjfkLw2yPtkoa6qcourg
diff --git a/.drone.yml b/.drone.yml
@@ -114,15 +114,17 @@ build:
       - export WORKER1=$VM2
       - export WORKER2=`$GOVC_GET_IP Ubuntu.14.04`
       - #
-      - ./misc/drone-scripts/deploy-and-test-wrapper.sh deployplugin $GOVC_URL_6_5 $VM1 $VM2 $$BUILD_NUMBER < /dev/null
+      - export CI_NODE4=`$GOVC_GET_IP photon.vsan`
+      - #
+      - ./misc/drone-scripts/deploy-and-test-wrapper.sh pluginSanityCheck $GOVC_URL_6_5 $VM1 $VM2 $$BUILD_NUMBER installbuilds < /dev/null
       - #
       - echo "=> Running tests on ESX_6.5" `date` > /dev/null
       - #
       - ./misc/drone-scripts/deploy-and-test-wrapper.sh runtests $GOVC_URL_6_5 $VM1 $VM2 $$BUILD_NUMBER < /dev/null
       - #
       - echo "=> Running tests on VSAN ESX_6.5" `date` > /dev/null
       - #
-      - export VM1=`$GOVC_GET_IP photon.vsan`
+      - export VM1=$CI_NODE4
       - export VM2=`$GOVC_GET_IP Ubuntu.14.04`
       - ./misc/drone-scripts/deploy-and-test-wrapper.sh runtests $GOVC_URL_6_5 $VM1 $VM2 $$BUILD_NUMBER < /dev/null
       - #
@@ -136,7 +138,7 @@ build:
       - export WORKER1=$VM2
       - export WORKER2=`$GOVC_GET_IP Ubuntu.1404.vsan`
       - #
-      - ./misc/drone-scripts/deploy-and-test-wrapper.sh runtests $GOVC_URL $VM1 $VM2 $$BUILD_NUMBER < /dev/null
+      - ./misc/drone-scripts/deploy-and-test-wrapper.sh runtests $GOVC_URL $VM1 $VM2 $$BUILD_NUMBER installbuilds < /dev/null
       - #
       - #echo "=> Running tests on VSAN ESX_6.0" `date` > /dev/null
       - echo "=> Tests are disabled for VSAN ESX_6.0 until we fix Git Issue 1057" `date` > /dev/null

diff --git a/misc/drone-scripts/deploy-and-test-wrapper.sh b/misc/drone-scripts/deploy-and-test-wrapper.sh
@@ -17,7 +17,7 @@
 # This script sets up the testbed and invokes tests.
 
 usage() {
-  echo "$0 <TARGET> <ESX IP> <VM1 IP> <VM2 IP> <Build id>"
+  echo "$0 <TARGET> <ESX IP> <VM1 IP> <VM2 IP> <Build id> <Installation flag>"
   echo "root user will be used for all operations"
   echo "Advisable to setup ssh keys."
   echo "run this script from the root of the repo"
@@ -31,6 +31,7 @@ fi
 
 FUNCTION_NAME=$1
 BUILD_NUMBER=$5
+NEED_INSTALLATION=$6
 
 export ESX=$2
 export VM1=$3
@@ -87,18 +88,24 @@ log "starting deploy and test"
 
 INCLUDE_HOSTD="false"
 
-TARGET="clean-auth-db deploy-esx"
+
+INSTALL_VIB="clean-auth-db deploy-esx"
+
+if [ "$NEED_INSTALLATION" ]
+then
+  TARGET+=$INSTALL_VIB
+fi
 
 PARAMETER="TEST_VOL_NAME=vol.build$BUILD_NUMBER"
 
 case $FUNCTION_NAME in
-deployplugin)
+pluginSanityCheck)
         TARGET+=" deploy-vm-plugin"
         ;;
 runtests)
         if [ -e /tmp/$ESX ]
         then
-          TARGET+=" deploy-vm e2e-dkrVolDriver-test test-vm"
+          TARGET+=" e2e-dkrVolDriver-test test-vm"
         else
           touch /tmp/$ESX
           TARGET+=" deploy-vm e2e-dkrVolDriver-test testasroot test-esx test-vm"
@@ -108,12 +115,12 @@ esac
 
 if make -s $TARGET $PARAMETER;
 then
-  echo "=> Build Complete" `date`
+ echo "=> Build Complete" `date`
   #stop_build $VM1 $BUILD_NUMBER
 else
-  log "Build + Test not successful"
-  INCLUDE_HOSTD="true"
-  dump_logs
-  stop_build $VM1 $BUILD_NUMBER
-  exit 1
+ log "Build + Test not successful"
+ INCLUDE_HOSTD="true"
+ dump_logs
+ stop_build $VM1 $BUILD_NUMBER
+ exit 1
 fi
diff --git a/vmdk_plugin/Makefile b/vmdk_plugin/Makefile
@@ -287,7 +287,7 @@ CLEANESX_SH   := $(DEPLOY_TOOLS) cleanesx
 deploy-esx: clean-esx
 	$(DEPLOY_ESX_SH) "$(ESX)" "$(VIB_BIN)"
 
-VMS= $(VM1) $(VM2) $(WORKER2)
+VMS= $(VM1) $(VM2) $(WORKER2) $(CI_NODE4)
 
 deploy-vm: clean-vm
 	$(DEPLOY_VM_SH) "$(VMS)" $(PLUGIN_NAME):$(PLUGIN_TAG)