More code and script change to enable vFile CI (#1886)

.drone.sec

@@ -1 +1 @@
-eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.FJ2hpLzy4pvUCJUSEa3tc1_LYd3fQ9tJ_MLjLRtw324YScsGu9HcdL-gkY7nm2OET60LU0jYj0iuvYuU1-IlEYnPV7kXriv6IBkchTnAHRBhXAwixvgBiCx1zdX_jxkgz_rLXpRJSxWKX25G0L8ddV33wJ7buTrJY5I8raeu7Iiji5zT2R-IiaZPAK4fUlNPgPdi7-_tg1sdH6qBDPW9f2uRQi9QcHlT0rBf4-aP_GUDMRpPyiYUN9kR_OG_0RIcyS6AOJeRwCNbeRnRQruZj0XkfIILKw8_wtq0Rq8PyEvYup2q4d4GruLwNDZ4vbUQ7-IXBrROa99qiz8YS_wTZg.sLLzcH1Lv2oZ5DRB.TqWmfVJiELe1aIr39YWFA1KJG0ughLA3Jwj3-v17uJXWfz1wTsfiaI5LAmmBC-RV1OkAowfU9IR5QZ9pdFt7kSCsdzAE_DgK4r5i9icMDrsRXJb3bMj1x0VGSKauohR6TjK31kp4qwqpV3j78KATNsoJmIFlJ-GyjhW3e0jV4iG7WRhtpZPAloN1nr-xXhQUpq80TLDmcrAhwJE6pdpbyfXsShHR0MrPuHoDCPVeor2FlYfJ2Z7zs9plGafX0KcpqcZyTNZKZfEo0rwRLxRT6jdALXEZiceXC15kHEdRgYBqIpM-ra4ccwYkThKvfJTRwE8R19xMRtStPtiJ3TzoHPH0ZWXdCClZOslVj0AbZq8D42xjEp2Y_KbjXULOhDUWT2C8HneuyJBUwWQbuTz1wOmNlo_Nli7Kl-MCiqNP9AE7USakGAONV1HmPsSTgmvdoQYmkEcWZ-iz2bfQRWKwCZM5rQBC-VDValBq09rHKb7egUfDguJsM9WS1o_aLh6xwHas_ASlGb0XTNzFoP1bhmFBbkPebTMLeMvqqSrPGwohZ7RKrYFA9tFZpCQVpNUvRtr44LqRl0H6i3GK-0iFoMZydZg2i-NV4mXagcAxpPTnftH0ck52O2z6mh-mdhylfBhgfaQoUVsQTXGXonl_OyfJSHehFA0ozNQM33czk72CAipfWISjx7aUbRNzQQnqcyY88b5hpuDLEV1Vh4PlyuthSY_r8nY-X1Mi9MVOj5Nv4jn5Zxu9RSWmp3hQuhOnwvzL9q3x75UshCOR2tZ_8kJ0Fb96vak2BvcBQ62p31JUkOpNT6ja0lhllq1XGU28SLL8QHGJRwVMG734hb8oH2jQz9aC3tk3P6PRJZb9J942HTfhbTZtDa7HZ4107pwgblo6OYX2SMYp5OM8_f2g8pAFjjc-Uw4NisJZ61g-U-fBVj63T6SWWJ8cIMb_0poC5vIgTVPjHhh69LSyqJH73qkdO2AyldnZJhR6BQHbx13kyRVsIa81CH-ZrfvBuj78-td6z2LKZE9D9QwvNKpTNNTXOSlWDecZj0to13lbCjSVxibFPVHflHQ31dg3qRVyDbr7j4_BdIgwsFmD-zDmnyVZ2CuiLq-FB7ZkA01rWVf0TjQAap2v9f5niYDW0c9RksJXleeP2OgTupmxaPlH64uYv2VerO83RjU2IseiCtqxSZC8SnAUxl1yt550AKMQDU2Bb1Clnm9jV8DcN0q6u2l_ZTRSWwHPR28Dfii8Qb_sT-7raDbqBUalNf0yQnFUKQdVDIuzzxsWSYvCr-JWimxIQsiGEhqQ9CQhJ1xp5NN6IDQMYxo3w6Yr-YP0Mhwraf-Ubvc1hZeqmgJo6ZeYDlQkCFduzemfstEOA_v85lVP-X9XLu1JD1HW8riAr_Id9i8kfKZp2U1WX6pjorW7CN_-PK8MYSzq0zO4AM2-hRxuvQAYF9jAyqau17HaBDkkonPUMNVFrQgKU6mwy4vZYRrK5gedxruHLiE5wAfLZr6sH8G5DAP6NM_UuSev2Jn_ofzNMSf5azYsu_bLRNEffV-NJEiHq-e2PgP4rTBeAi8f_JvuDQi0kzRg86B65iKUGY31ZJpQyHOFjvlcUeMDHRTf143d3YjIcYFRi9teFNWFicn3HjDo_RhiVCfwvzrPLRYwJQ875uyiSXGWAj4yW36i91hfu1E32Y1sIad5nTlyUT_zVt_cNmRVbkqtS_2DMoFRw4PmHKZRa_fBsy6TIQ6nN78aEAa6XzmYZK5QtNEZdKVosIZnGJ-YCquEteCRD_97s7lydtaMzi8wBe2OJCAtbZj8LUPG-rPy5__LXrmRGN9vEPglaxT8XGdl4MgFUWkJLBLJvgTL2ZNczjMy0h9P9kiSXb5IPYt-3F8QTYCVqMzJ_xjEQUYlzJtUaCxkcmXnWDBg_zF3ZMEW4ZxnhN3xChD5rwNeuIjeMuFO1_d13dI_mfXoiFjC9WdeYtfq6OM_VIUGHDQgL9N_pKKPqlPxOFu812Stx1oKR4-qn8e6jNsfDVQZTEWz3gdqxmDQ7OqDL-tRAs3alrT0TNI4UqIAvIUxIl3hP8AbN3xti8WB9BCnLxElH6EtrQI1DXdbZtjEZ7gNq-BEYGWEOSX1AmGZNNGA2g9uRkqMYbWdgLNu89R6RnPbQ20dJu_a3fo2RJE8dsEQtoJEKsc5T2K-hgAlodor46MUvud4iIAkIzifTK4LV2dpB3j8ESOjFAYGtddY7geFJEp6mpLjAEg4nQ_r9G38TmiblE7NXeU8HDhzxN1oGyHbgczQhM2TQq89juy3rPJgXoXCDlqoV5K4-H49XO-kX3JLOIATTwyB-0SWZ6HgQrveGavB_ReXV9wV1WUoLdUzaZUNbJjMvSLil4MRD6P_b1b4zf5OBv0OhQXabKbvB9VHXU0agnJxQbaPMZCDEOyDJmHQJKqrQNVj1QvlNVvHA-wzCd33Oq-x4Z7EW0r-Ps5krBcsnKRwUHIPMyUKooUw9Nxd2Fq5S6hbh_r9SKvGKqTdnYh0CmLRKlBcWXTkWgMNIXjrhfIWRlDR901hQZ_lNvP0VgMwe5hrvqvdHJUwc8ExwxjhR_7nKj6eu9kedcQDQKJJiYn0EswCYobRJQk0CsIc_0gbUYPVVQizVU2hMIffMJ6E4V6nQ9YRS6o2Z6lW-a0aOuVHt_tzoH1pPRMDbrSa9OVvn4fi2_tvda1rneXKe3UtWuBEp2SEVu8JftB1eCun1FZT_oFvFtmosqpgDjzruN_rQrFyEkx6emdX1viFZ5PZgeNPKIMGcS4d_TjHgAv8zkAX0uXBYt4hdWAODo8uKfbF5Vye9ateowLRBN3LVcDsBOj81zBZwYmBT6N63H0E1o_SQhI-LE37CK9BkScEZr5Pncjan1b2iKvu_VMXzPBDQLu3CciNg0MW2d5P1bYeKW7jClrN7M7UegM_ZFv_LijLRUzIxV185CyW7bPLRVpEKCDmzpBtInfH24x4mv78C3Yu2fXxKUdj1l7ZcrxC3Dpv4d3jIVTDV2Dqq2lTIukLMw-zeRclHKE3lx7Rmb98KULtv0SwueJZaPXc3pR4Rkz3QAZPz9fAkDaxuy3F2V_qz3zO21tMV52CKaOGn8G0K7SgDI-eOHQ_jVSlW-tTiCSaBc6Lf9a18UFHQZ0-TOq8brEGcONbVAuCtcgnuvnwrzCu4DUC2TPxnZHxE6Avom5AJ0F1br1V0zfsgQyDoiRQojYPdQtSQ5uqbE8EeyWKT_qHhWpZMKUR1nGTqreNRf5tYy01aM3eIygjjgjl34gEDcCbm1R87ZiuvsXagdkd0-5Ndn5kRtj5tQveaunWiWDERUJf4dRqoLsSWOqG6v9J1xYZNCULszREu_dMByL1LR9VK5TN0vBYHOLnIje3CHwXTScAC7iS2O-XkgvkJ2NRoS2AdyrdyvGRdBUAHpKRHiNjDoPVxV0aAM-pDXtEQtz3r7ITLDFFv0aDKPCvP6hjPLBgb1poc1kB9WTy8SXvrJ49OtDdz26JPebxWyAxqD9a5jjRx02bRSqAbMIteojYX2M2dH2-WR102Qw_oeTxxXZ0c3nGepP8RmxUPzOkL223Xr2xI2jJIfWrx902EkAjNiV9YxoKAps64BLWQvoixgg1skm6CHIpoLhBkSG8vIC4LsrVVNitR54fgaXAPLCTtr0dmsIHGYd-StHATqSh1mhgNVrjY14WzbETHk5CIWQoobIDyuoAnf64LfXNWQ_NZ19SyHSXb00HC8VSyMUt_G6d3Om90-QoP_Gv6CNHJo-mPLfcY_JD0FmTk1IVOGw5xZvcffGHR2VBYclbps2uV9L2719QFIFopX8xs8QHfSze61g3lu_q6tfVw2DniXNNY6XDf0VXSYregda4SdbS73BIbOophjIzLmX9_MApMaoiKdcKOjHUq0kPR6rNdPE7viaB64BVCm-v2mlO2JQ.0R41msB0pihHCKSOgBHYjA
+eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.EifddBqLpzhh_d2QKYNleYw_6nXWy_6BFFYz_Kut2CcylV2HzRheDpuWT2fUrlvAnqhGzahf2iMbY-GO-LCSQI6ujbJKbFb-72o4ajPNZZgQMV7qZxmNS7ZCABdflPVLmpFUjhL257yoV6ZlAKX8iRNsNRlTj-0EUcQPUPSyiyluMYbhmN120p4lrwlwYEhhFCzUdylxasK8dEbbMmwP41KRFW3JacbbLwFOkihekP7t-jJNsXIl3JOPmzbugAjZftRxXvJdNrYZ29LYle0E5bNNE8wPeIDRjI1dcmOeI07dF_9QSWg2VDjnSXqdA2GQj1fOF8UqU4EFk9kvpAYt4g.Y5KJWi5glq196qhc.mWYAUhryhduGWFJN3_E7vawUQeAqenIKVkagaFrjywjXImbyBy1DbKUGFTmm7T--W2zoy8tKoKlnqYPQ95S3qpPB48NNVd3P-rQ-KsVY7il0c6KqPbevldr42x2ovOofV5rw2spm5i4PhVvAjLoa277fOOBIgMwLRBJ6Jrwi9HDXy3asSr0KjT1rFXsbj-imSt-VpS9eKSjBAoYDmFc5IJMxONT8ohzPp7Z-PpjSrON0KtrK9bvX4Xp5MFsIaYz2Glo4hGzViXq6AKuYQBK6BMYv3SG-Z-_OXZS0C3crmajOmsSyIMDfExOIDzjeMt5QS-0HA2_UzxxRNrEgj1OGGr9cV02yXIusMNPGz_8z_c5UkOYHKSbF3yr69BxO-FR6l2An903Vrzvpky6_cNceoQ5k1t-TzQ4tPMsjounoYRCiUr_wkoK-mtzofLND1Wv2vlBG1Wz2y6fM7NEqFl0NK_D8NBa0HFw0ZoJlioCQ9px9_Yc2XHwRmAywTnGJrMu4CP1s8m1FCz37SKnUpy-EA_Q-I-PedgbDsf3raQ5A0f4Oh3rY11Rj1HaKg8SpqzTWbZ3drd4iePabK9llDQHwKn_ue5Fwp7DQxmTgqw3B0YL_txbKhEjckurnuAcLMWddHWZAouec6LnEiUI_f-OzkbQDqybbdNinGGlhQ1j4_9dlEPZQ4pH7mORqHiPGuaTfc6TKBfecPqDpe62PI58UcMN2ktqp2sL5vUeMbWO7gh00q-BGRL0NUZEePV7pXPC_vpKYMJG2sCYHkbfG3vKj8l6MMMcQSSFnBeC6AvWOauWfQfNYWUA7-k6C02ZZeq48L5NNJMKsTHjgIv5YmP9oa3_WznTVOG3Hc3MQQ1h3kcUv-KK555FoBcAa0QAd6RPMxp7Dv8EFWcHAWdy4wKTYgvYXchrhXvoVp_11r-zbSQc_ON_cBZz0SssfxHxtn0nzSsEyDRMePTLSdYNQDWAlBqsgePRWzXi-LCJyxcDAuF2b-PDyTnFky2baGCWrQFfNL4tQa8MFHscOEbKE_HmBjhuEmg60t5HMWxTIoykZPH9Ii7iQSgYirEvy4vneq6cgN715MbA1Ouu-3W2zdT3Xru-c5svCakaFOq2QkFy-MWmjIhlr0fUBkg_Z3GRTXzCd9joNjsmaKaX0uvItHk58h3tLwAqwEpqHCS15MTYVPlnGFwgVi1dLr5NxcaK9xnTH1DsiVCfgohEe5PnsCUOy3juqbrwJQLq2KjO-2q7S3PK_c9vvAy0lOyU-Y-vKzJQVGNOXLLdqCFTIa8xuSu9tqtwEY1MRGHn633kf4_hYT7SYp5CwIzQUuOquFvx85TOF-0pGi-SiRB9DoFUO-VQjJb5i_f9CB2LIbQ4As8F7wPPqVlhvXktNW7MNHe8WqWyYQGGTt23cZRUUFFxzNLTcqkrbdPqANCbXunxnqusMTZxMSntT42qNQqwrS7jPpgWcdxQeALoNp4asqbs14ERU9MTWjnOUHkXP2Irkddq_Vw9Oomaqcqg-wkK6vv-ZT_XH1IyCILKwJhi3KSsAmhydtRV4YYHPHLPVNyFHKY6ol6wrEELiIwegMv6IowAWNBOyWVIBt6iRfCTY-3hxgRxRi6nRArLuEvP6O61mdIM41lfNhB8XszfID9NLXg_7lVzZzl6BX8RCIa7_s6kv5mHxhonqjK-Ry-_o_cZSELMuO8PSViEjGriLqAnTznHdKycpmVi4UchF3sIMtjBB_qEO00OuyUA_tieuGZRHqTRH44xzk2JW2raguKM28Pnpyf8cz6q2dUuHvZMVo4e97H0RFXibDRraI3L2hpEhNUeosPsWZKqPMZC3qyF9tvkCZ41w23DJj4lQYaSwgYmVtSP4qSmr8rOExaFdHa1KRCV34P13nAExM3zz9PVkWowH6J6gz87DYJB3ujamkTXrfynuB_5WZVsoQsdTq21gZrdCF9jVP2S-FCSHXjxZ9QRNeh1PWh_W23zjYBakxcgE8hsu3NhNoSzYC4vP4xFbYWyVE9CAFNGgwq0LdMx6Z4baHVUBfODThj1081CE062emlU7tJbc2ZCDZn-y419KMutZdtVv5694XkxvmcqDTOjFGDhGxWS99zB6TumDeQiffuFDROU1TUnzFgnU-5cDovS9WlxyuIFhbI7xAFcTtbSw9EFpbSSnxaLdYfS6e_KSTFXDHL9tbzf3_59V4O_YVNCn9M-RJ1bDAk3hcIeeqxp4oQBEyCP4qbek6PMNoUf794xZ20KT_DJXLSD4K2YT8TumQ_Bov9S8RX-_0DY3Phv6lBpED3vPlkj_iXgtYTXpLBIDnqhfuKkn9KSwflqCC4QbM0E9nkLMUOuVRbYUQ4rgLkrTO3sSa-HNrm5dUMw4vjZ3XXnqWdQlIRN2cAjUBnfzjUcuV0oPSR0S_d_MlmCZ3H_pa4hiCQnou7JjA4HBrEem0bgWXTfr-1fTylMLrHP3QrPx_1WGPrk0xzftpeqbXxaCDIYtOo_hW2st98GR-FJ1Aisu9W2VJMEEzmi0to3C4nJDoS5UhtpUvMb1NdGWleSQ20YaNu3FyZ3gHMwoUvYu4NUC-DwY_Im1f26u0bQiM7oe06lqXT6fNSZjwOYig55u2QjYYy7jINd_jzFhIOWhxokrfdkJB5jbGUZk67EKFUudliMMbN-MJtO5PoRqlcte-N4ZAXiiHlXtW9LY8tgWBLoDCSKa0chSbLSvC88Hg-mnNMBaSpPVCDS8obniY3Bh2tPBn2DpOttJXkEds6RTCbdVnjxHxrBsrUn8qWyWQ16zhOJAr0lXzSiZHS7LwMChzm95WGyEOHg1-VlEzBXMF6q3dCbxTxLg0hxF6fN8P9FY5Fh7Ya2PeJUrk2oFIgOTQXgVnw9i2fBwRjD4NLOpYtTkj09Zxqh5jXuax-6ZdV3lcrZ0_ivkvQsPsiAF4UXuV4pD1yF5hlg0DjuGuHoBwHKrpqb1AzJ11jk66IvQkd0h4BVEcqAyAWORv4Uo5_4hXH7cvjdhQKOVgEQ7Iqo9-pa9kwDec8a5NRE1AiXuSPB5dd_RcIhu0iDpTFbZIWELHCk7C-MwlbmR_SzS3vnxntD_8K-SpD3b_opb2KGvwOeTKOsBEZIrGubZLjnPwz4_djYzNEQc-PnWPuo5xl2fqk3ghpKH6UvayEsQAcYn09jS7101zZC_APki7QRgGJxPNqxdOgBIl0bLs5dX0yfptEEBvf0zsngLfL-RiLnpgp98vTv1-Wtmccxjxv_nTGznduqvhGb7kh3vz3bUU2IHhDejf0qkTgvVHVMF23Ba_FHIJk70Q6TATJ7MIM8ILeMdxnRre5CB8Gc20J_hMArL7v4nRZroEp0SWolsm_EyBieboxPe4YT4hzBWyHfiNfbvx5jjwoegF2Ot1IjCnpVIv9aijsAS4iSYBDI4A1pr0fIUW2g1GF10b3n9au9_nGeRIQ24TT-eDpIg_wc9ifxEf_1rjUzNyOVnHqhzW5xneN6VPgzIbZQRPm9EqW31kuXyJ00o6gaZW8N_Z3bcny3zuN4-HpOt9lzGd4G5fgu-mMPhfBDutBjSNRLoBhgERzY2SgPt0xHhMwbn_kpIojNYOakNo7RFdSIyeN1R2D2NM4xKBfnr0kyCai6lovkwEAHfgWp2xl1UK8DzwWCIr3YYMx2Avc2HQ7AxZvJH7O11Xp3QBdG02Xn19SjHtSPhc3xGHSI2wjHbIwBLdPEYM1djIm7n_TkmcBg95ppH32pJzbtNWKsxpyauxtkXqrJdbalaikJDFa_oyD7GpW6bMfYBMFBBVAns6QVTHoBh1g5GNoeqSD3XJX25tUVBhHJvGE8xEQ7fMabZcuOO_vhQn2RH0OngNVbUxgUarABfiFFajb_syz8rjbYOi8E5HTTA_fD16-TfR88L6bYVNkVJGVcDK-ieNQO-bdU9sSuiFAyXjV0Z6Z-0YzM3qHg.WCiEgPW9MMuivG9uSg5-WA

.drone.yml

@@ -122,10 +122,15 @@ build:
       - #
       - ./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
+      - echo "=> Building and running tests for vFile plugin on VMFS ESX_6.5" `date` > /dev/null
+      - #
+      - ./misc/drone-scripts/deploy-and-test-wrapper.sh vfileplugin $GOVC_URL_6_5 $VM1 $VM2 $$BUILD_NUMBER < /dev/null
       - #
       - export VM1=$CI_NODE4
       - export VM2=$WORKER2
+      - #
+      - echo "=> Running tests on VSAN 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 "=> Building and running tests for Windows vDVS plugin on VMFS" `date` > /dev/null

Makefile

@@ -43,7 +43,7 @@ build-all: dockerized-build-ui
 	$(MAKE) --directory=plugin_dockerbuild all
 
 # build vfile plugin
-build-vfile: dockerized-build-ui
+build-vfile-all: dockerized-build-ui
 	$(MAKE) $(MAKEFLAGS) --directory=client_plugin dockerbuild-vfile
 	$(MAKE) $(MAKEFLAGS) --directory=plugin_dockerbuild vfile-all
 
@@ -59,6 +59,10 @@ ifeq ($(INCLUDE_UI), true)
 	$(MAKE) --directory=ui $@
 endif
 	$(MAKE) --directory=client_plugin $@
+	$(MAKE) --directory=client_plugin build-vfile
+
+build-vfile:
+	$(MAKE) --directory=client_plugin $@
 
 # Forward to UI inside docker run
 dockerized-build-ui:

client_plugin/Makefile

@@ -310,6 +310,7 @@ DEPLOY_ESX_SH := $(DEPLOY_TOOLS) deployesx
 DEPLOY_ESX_FOR_UPGRADE := $(DEPLOY_TOOLS) deployesxForUpgrade
 CLEANVM_SH    := $(DEPLOY_TOOLS) cleanvm
 CLEANESX_SH   := $(DEPLOY_TOOLS) cleanesx
+CLEANVFILE_SH    := $(DEPLOY_TOOLS) cleanvfile
 
 
 #
@@ -337,15 +338,15 @@ deploy-vm: clean-vm
 deploy-vm-test:
 	$(DEPLOY_VM_TEST_SH) "$(VMS)" $(BIN) $(SCRIPTS)
 build-plugin:
-	$(BUILD_PLUGIN_SH) "$(VM2)" $(PLUGIN_BIN) $(MANAGED_PLUGIN_LOC) $(SCRIPTS) $(DOCKER_HUB_REPO) $(VERSION_TAG) $(EXTRA_TAG)
+	$(BUILD_PLUGIN_SH) "$(VM2)" $(PLUGIN_BIN) $(MANAGED_PLUGIN_LOC) $(SCRIPTS) $(DOCKER_HUB_REPO) $(VERSION_TAG) $(EXTRA_TAG) $(PLUGNAME)
 build-windows-plugin:
 	$(BUILD_WINDOWS_PLUGIN_SH) $(WIN_VM1)
 deploy-windows-plugin:
 	$(DEPLOY_WINDOWS_PLUGIN_SH) "$(WIN_VMS)"
 build-vfile-plugin:
-	$(BUILD_PLUGIN_SH) "$(VM2)" $(VFILE_PLUGIN_BIN) $(MANAGED_PLUGIN_LOC) $(SCRIPTS) $(DOCKER_HUB_REPO) $(VERSION_TAG) $(EXTRA_TAG) $(VFILE_PREFIX)
+	$(BUILD_PLUGIN_SH) "$(VM2)" $(VFILE_PLUGIN_BIN) $(MANAGED_PLUGIN_LOC) $(SCRIPTS) $(DOCKER_HUB_REPO) $(VERSION_TAG) $(EXTRA_TAG) $(VFILE_PLUGNAME) $(VFILE_PREFIX)
 deploy-vfile-plugin:
-	$(DEPLOY_VM_SH) "$(VMS)" $(VFILE_PLUGIN_NAME):$(PLUGIN_TAG) $(VFILE_PLUGIN_ALIAS) $(VFILE_PLUGNAME)
+	$(DEPLOY_VM_SH) "$(VM1) $(VM2)" $(VFILE_PLUGIN_NAME):$(PLUGIN_TAG) $(VFILE_PLUGIN_ALIAS) $(VFILE_PLUGNAME)
 
 
 deploy-all: deploy-esx deploy-vm deploy-vm-test
@@ -450,6 +451,9 @@ test-e2e-runonce-vfile:
 clean-vm:
 	$(CLEANVM_SH) "$(VMS)" "$(MANAGED_PLUGIN_NAME)"
 
+clean-vfile:
+	$(CLEANVFILE_SH) "$(VMS)" "$(VFILE_MANAGED_PLUGIN_NAME)"
+
 clean-esx:
 	$(CLEANESX_SH) "$(ESX)" esx-vmdkops-service
 

client_plugin/drivers/vfile/dockerops/dockerops.go

@@ -62,7 +62,7 @@ const (
 	// Samba service listens
 	defaultSambaPort = 445
 	// Time between successive checks for general checking
-	checkTicker = time.Second
+	checkTicker = 3 * time.Second
 	// default Timeout to mark Samba service launch as unsuccessful
 	defaultSvcStartTimeoutSec = 45
 	// Prefix for internal volume names
@@ -347,12 +347,12 @@ func (d *DockerOps) isFileServiceRunning(servID string, volName string) (uint32,
 		return port, false
 	}
 	for _, task := range tasks {
-		if task.Status.State != swarm.TaskStateRunning {
-			log.Infof("File server not running for volume %s", volName)
-			return port, false
+		if task.Status.State == swarm.TaskStateRunning {
+			return port, true
 		}
 	}
-	return port, true
+	log.Infof("File server not running for volume %s", volName)
+	return port, false
 }
 
 // getServiceIDAndPort - return the file service ID and port for given volume

client_plugin/drivers/vfile/kvstore/etcdops/etcdops.go

@@ -63,7 +63,7 @@ const (
 	etcdRequestTimeout       = 2 * time.Second
 	etcdUpdateTimeout        = 10 * time.Second
 	checkSleepDuration       = time.Second
-	gcTicker                 = 5 * time.Second
+	gcTicker                 = 30 * time.Second
 	etcdClientCreateError    = "Failed to create etcd client"
 	swarmUnhealthyErrorMsg   = "Swarm cluster maybe unhealthy"
 	etcdSingleRef            = "1"

client_plugin/drivers/vfile/vfile_driver.go

@@ -30,6 +30,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"time"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/volume"
@@ -55,6 +56,8 @@ const (
 	internalVolumePrefix = "_vF_"
 	fsType               = "cifs"
 	initError            = "vFile volume driver is not fully initialized yet."
+	mountError           = "exit status 255"
+	checkTicker          = time.Second
 )
 
 /* VolumeDriver - vFile plugin volume driver struct
@@ -642,34 +645,45 @@ func (d *VolumeDriver) mountVFileVolume(volName string, mountpoint string, volRe
 	}
 	mountArgs = append(mountArgs, "-o", strings.Join(options, ","))
 
-	_, addr, _, err := d.dockerOps.GetSwarmInfo()
-	if err != nil {
-		log.WithFields(
-			log.Fields{"volume name": volName,
-				"error": err,
-			}).Error("Failed to get IP address from docker swarm ")
-		return err
-	}
-	source := "//" + addr + "/" + dockerops.FileShareName
+	source := "//127.0.0.1/" + dockerops.FileShareName
 	mountArgs = append(mountArgs, source)
 	mountArgs = append(mountArgs, mountpoint)
 
 	log.WithFields(
 		log.Fields{"volume name": volName,
 			"arguments": mountArgs,
 		}).Info("Mounting volume with options ")
-	command := exec.Command("mount", mountArgs...)
-	output, err := command.CombinedOutput()
-	if err != nil {
-		log.WithFields(
-			log.Fields{"volume name": volName,
-				"output": string(output),
-				"error":  err,
-			}).Error("Mount failed: ")
-		return err
-	}
 
-	return nil
+	// host can be slow which results in host unreachable error during mount
+	// retry the mounting before error out
+	ticker := time.NewTicker(checkTicker)
+	defer ticker.Stop()
+	timer := time.NewTimer(dockerops.GetServiceStartTimeout())
+	defer timer.Stop()
+
+	for {
+		select {
+		case <-ticker.C:
+			command := exec.Command("mount", mountArgs...)
+			output, err := command.CombinedOutput()
+			if err != nil {
+				log.WithFields(
+					log.Fields{"volume name": volName,
+						"output": string(output),
+						"error":  err,
+					}).Error("Mount failed: ")
+				if err.Error() != mountError {
+					return err
+				}
+			} else {
+				return nil
+			}
+		case <-timer.C:
+			msg := fmt.Sprintf("Failed to mount vFile volume %s after timeout", volName)
+			log.Errorf(msg)
+			return errors.New(msg)
+		}
+	}
 }
 
 // Unmount request from Docker. If mount refcount is drop to 0.

misc/drone-scripts/deploy-and-test-wrapper.sh

@@ -118,7 +118,7 @@ winplugin)
         TARGET=" build-windows-plugin deploy-windows-plugin test-e2e-runonce-windows"
         ;;
 vfileplugin)
-        TARGET=" build-plugin build-vfile-plugin deploy-vm deploy-vfile-plugin test-e2e-runonce-vfile"
+        TARGET=" build-vfile-plugin deploy-vfile-plugin test-e2e-runonce-vfile"
         ;;
 esac
 

misc/scripts/deploy-tools.sh

@@ -30,6 +30,7 @@
 . ../misc/scripts/commands.sh
 
 PLUGIN_NAME=docker-volume-vsphere
+VFILE_PLUGNAME=vfile
 VIB_NAME=esx-vmdkops-service
 TMP_LOC=/tmp/$PLUGIN_NAME
 VMDK_OPS_UNITTEST=/tmp/vmdk_ops_unit*
@@ -92,7 +93,9 @@ function buildplugin {
 
         fi
         $SSH $TARGET "cd $PLUGIN_LOC ; DOCKER_HUB_REPO=$DOCKER_HUB_REPO VERSION_TAG=$VERSION_TAG EXTRA_TAG=$EXTRA_TAG make ${PREFIX}info ${PREFIX}clean ${PREFIX}plugin"
+        if [ -z ${PREFIX} ]; then
         managedPluginSanityCheck
+        fi
         $SSH $TARGET "cd $PLUGIN_LOC ; DOCKER_HUB_REPO=$DOCKER_HUB_REPO VERSION_TAG=$VERSION_TAG EXTRA_TAG=$EXTRA_TAG make ${PREFIX}push ${PREFIX}clean"
     done
 }
@@ -143,7 +146,7 @@ function deploywindowsplugin {
 
 function managedPluginSanityCheck {
     $SCP $SCRIPTS/plugin_sanity_test.sh $TARGET:$BUILD_LOC
-    $SSH $TARGET 'sh '  $BUILD_LOC/plugin_sanity_test.sh
+    $SSH $TARGET "sh $BUILD_LOC/plugin_sanity_test.sh \"$PLUGNAME\""
 }
 
 function setupVMType {
@@ -166,8 +169,14 @@ function setupVMType {
 }
 
 function installManagedPlugin {
-    log "installManagedPlugin: Installing vDVS plugin [$MANAGED_PLUGIN_NAME]"
-    $SSH $TARGET "docker plugin install --grant-all-permissions --alias $PLUGIN_ALIAS $MANAGED_PLUGIN_NAME"
+    if [ $PLUGIN_NAME == $VFILE_PLUGNAME ]
+    then
+        log "installManagedPlugin: Installing vfile plugin [$MANAGED_PLUGIN_NAME]"
+        $SSH $TARGET "docker plugin install --grant-all-permissions --alias $PLUGIN_ALIAS $MANAGED_PLUGIN_NAME VFILE_TIMEOUT_IN_SECOND=300"
+    else
+        log "installManagedPlugin: Installing vDVS plugin [$MANAGED_PLUGIN_NAME]"
+        $SSH $TARGET "docker plugin install --grant-all-permissions --alias $PLUGIN_ALIAS $MANAGED_PLUGIN_NAME"
+    fi
 }
 
 function deployVMPost {
@@ -286,6 +295,15 @@ function cleanvm {
     done
 }
 
+function cleanvfile {
+    set +e
+    for IP in $IP_LIST
+    do
+        TARGET=root@$IP
+        cleanupVFile
+    done
+}
+
 function cleanupVMPre {
     case $FILE_EXT in
     deb)
@@ -343,6 +361,10 @@ function cleanupVM {
     $SSH $TARGET "docker plugin rm $MANAGED_PLUGIN_NAME -f > /dev/null 2>&1"
 }
 
+function cleanupVFile {
+    $SSH $TARGET "docker plugin rm $MANAGED_PLUGIN_NAME -f > /dev/null 2>&1"
+}
+
 function cleanupVMPost {
     $SSH $TARGET "$PIDOF $PLUGIN_NAME"
     if [ "$?" == "0" ]
@@ -439,14 +461,23 @@ cleanvm)
         fi
         cleanvm
         ;;
+cleanvfile)
+        MANAGED_PLUGIN_NAME="$2"
+        if [ -z "$MANAGED_PLUGIN_NAME" ]
+        then
+            usage "Missing params: managed_plugin_name"
+        fi
+        cleanvfile
+        ;;
 buildplugin)
         PLUGIN_BIN="$2"
         MANAGED_PLUGIN_SRC="$3"
         SCRIPTS="$4"
         DOCKER_HUB_REPO="$5"
         VERSION_TAG="$6"
         EXTRA_TAG="$7"
-        PREFIX="$8"
+        PLUGNAME="$8"
+        PREFIX="$9"
         if [ -z "$PLUGIN_BIN" -o -z "$MANAGED_PLUGIN_SRC" -o -z "$SCRIPTS" ]
         then
             usage "Missing params: plugin/binary/script folder"

misc/scripts/plugin_sanity_test.sh

@@ -20,7 +20,8 @@
 echo "plugin_sanity_test: [INFO] Running plugin_sanity_test on the clean test setup..."
 
 # get installed plugin name
-pluginName=`docker plugin ls | sed 1,1d | awk '{ print $2 }'`
+PLUGNAME=$1
+pluginName=`docker plugin ls | sed -n '/'$PLUGNAME'/p' | awk '{ print $2 }'`
 echo "plugin_sanity_test: [INFO] Installed plugin name is:$pluginName"
 
 # make sure plugin name is not empty