Merge pull request #797 from vmware/it-is-done-6.5-is-here.kerneltime

Support for ESX 6.5 in CI runs

.drone.sec

@@ -1 +1 @@
-eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.JY29IzUwGWjjLvS7jPrKVtFTChbxt9dto_fH9ayz52ezOdgYJNuI0DFG1I7HJnHR2FZ9X10QBRVCU88LnrYizuryeuPbBno5P9UrwLFcf0vBeU_lsvZmeBrCRCY3J__rLIDc5BHdSxCfjAcoLfy14efDv7gQYMu8bejl9xSn1Gjt3BI4TtOeL3728XReyY7JkQZfMCV-DRRybG7t__trQSDV4Gj_s2dFchMTmmCQLGLFv3vtLJuVLYksMVcwkqODG-YIuZy623BbR0dRXWOMO8pZR64hHmV84rVZOiVt0Uczwr-Mrvvy2YYqYwq-9OoOxGqu5hl1CHu5jXLlBXUIpg.Ydq4N_iLh3_uXwXB.a9g9QOWyjUQzpEfqbDmVIXI4foGOr_AaaESUTiP7EpM8oLaWl7JqaACZ06VAL_LgrbAIYlDjjuTRZoGC7u21ifVKreM1RY7PhNlwwj-TBPD5-jis9S15Ku65t-jcPjcOs73sueh16-aP2Z_g-hh4gM7N-oE3rhqz8WjsJTwxSLrKh0M4-qfZL4XULF7Q2U556sJjF4oXfmEE58l608SueXK0zw_dhRyjSQ9QM0jzoUh_tE-wIo8uvvXIVE904NfjBrjVK2iO9HEq3US053OSaWkcdaK4vd9si1NadUd_QuWVZ191Dzc-goRUOTE4es-Ce3ZFpD-0Kom7Q6Ev1jchJsJEGVJ8js388C9XtJCKrt5qq3Fl9IC8WldCv50zFF0mF36Ha5lGFLL2-eQGt6jk79I8bpanXeCn5BveXHdFIn4Q2T1uugjYeMq-OOPqxhod5nb21FhciKpNR_MsoPvqwl1C2PsyIgogCdQUl9XNdjLnlE-T99rihvH9tU7a1o6-hiiClyJbS-TbvlxvOfEzFdRDYUhROMKnFON-iHDJ649gUm7uKXs4zYP7PvBYLcopAEHgtOealYEFNVNtPYgE8Wp0wNcFA-ptubsLtNUIQklNYrKX5im0byBIR4iO4evL5Z_bNVRDyymc8BkgUKp2ubvLRk6XfyoSrJG6OMPidz2t9KAeBPg82C3ss2PallirzTENspFF1v0WYatVOeOAUhif2jd8yDBJzSIK7dO08S4zUHiFI8ohfPCQjpi5RlsfeIDzT0E050VoqzCZpnEsOC1KqgVV79vQc2AYk_-ju41OZNapee0_VV6G__IXL9jlTJWZ_FReQB41Ww0myfGW5zGBmYJBnGxZvt2G2_ol66bWqp69zZArbsgnqioOn9_uznwH0L_doFiNlRq3cqAUvondi0U9p1gLKhnhaw9EuDNzbzGJTppB-zBMK141I1nE1q3xua4-5vxtc78C6w8SnqRaEJeUathvE77DsiPKgLobZBFrczf-CO4FIiA2BIQ2YAPEv4xbUrNHrRsZ87q20lDnVToUCsnAlVSNDTCiKien8xP-DEJMIbYJc5xVGj3_mlT6beZYYl_b2vtL13YdTSVjkOGydwb3SfVCEqeehXKVbS049Jgvncq4CdCnTUvafsF4K9ND07iQcibmw40mZPtu5bQiSsNbtRzGkijWJ1V_vp0Jr2NAgZTsAox6YQFH68jrOKJVJQqw2xcRbCFPlXq2H06Y4g15yrLjWrjAavtaeQNsQO-1RZv5Tvt4VkS--7pRrHNiUhh_yAF1B6SZ3y1hCsyhqjGcXfT6PfgCBOfoT2l35pSI7gd-aX_nHMW4FLsmA1GgQ_-5vKszXajELyxnzfOaVzSZi778ezRS0lCyB6_nnEOqsXtRJnrRLBZNXzoquHRhnMh7yWYfbegP56JOh2NoIiYYgXgE9zUtjtjyZIFCXq7wINppu2ZMlFkz3cpIfhHN3nAlAiNN1F25jzp7XqI3d_6FkC5K0FoCth8uka1EwMPgz_1gDd4zRdm2EGV3S4W6HZoMFyOLueXWCx79dgVW_tRHq6pwCGfGhFTWIa1XLI9BTRZqj56vp77xhwsT1o0hrpmuGsX8xQIfKYSzBrrtnNjO71tfl3jjEOkxHIe8Ua_bPgNwS4lmO1lO_R64gbr62-rKyJb2k80O2bNjX8YB8KBIZzRk6w7VERoVOB8mGtcTqGa6h6j8X4ZMsfpwSB6X2PoLCzgSnL_GboFEiQLDmggnBGRF2m3wwDz4HDK1rySe_K7S72HcPvOmSwT8KOGk6RHgciTE53Ki_RFXXRf5gxGhH1-JTM0u048PDOHfiAaR92oK-xcWiAqQwtnVMuAeu4iTDu7HQ_tfdSPOw14-_3wdjFvSQlBKQ6VnES6p2H85QnDpoXW7EqshCu_xiuGdxtGj7knOiZNjyp8zbviuqNQ1eWpyi1ZG0ZoREbfHqyE1Qfb0VK3tJny1Ee6p01m_loSXGbmZ1_HuyQDQaTw4Lj6BFRsI83jH1UhNn0RadmIzdKlMkHHbKjJoHfqsLp8611qvPyT0_uxramqUYkwLxdEq7QHkYirY7j4cAIJ0Z4Qx4TbJWwRjv7ODhjGIE4qUmkROQBx7tktf0X1FX0c2N_gnDDSLHQd_9vplk_oikfG_-KjUEyyBC2gg0A9SU51Sb3frtaQf2YkALItpwkTniIdR4gJMOcEWiVbkFzj1RZ7H06z34qFLA7Bn6E8utSItof0zchHoPxG36-xxyk1lq0INicgaGWDEt6WUfOc24aYPp8g5ggNManeNtED227uVIh90YzQSywuU6vosqkWNo6S70ZW0PNdS-mu3z-naKoVmVXYX8gQUHekenA_aIm2nXU6wnsUlA-HUCKv-aKzcDNAwAcwJF9r3zU-9t4amPGIR99C1tsGnxnuTSx9-OxX9SEd57kBjqaPtD6cSDkwN-QAz5cK4mQ3mcBBuPgi9Bwa4mJZQ9IN_wmrNyW9RfU4XGOezuiyRHQcxy1vmf1Yp2NGY-doM6BIFWEG0fdYchE22Brl9SAgQm8Gf5nRdUqGk2CPUk84c_xAHmlXL6HZVH3IlUXxJ6RNLodV2P004epA6gFdFGVrGp2ek1ssUHsSsisPOcaEtzpQukJj9e_rngsUfr83NqPr9rWMKiWlYgwA737ZXnybGLDRz6Jm3DU6J4BpxjdM1yoXEVhom2mnA1IBHPnJbWQG-p6rGAEiybk5hlLIm5Hii2r09HUFIOPdiXxx8UkvzoL_udD42T7zgkewvuItFHk6u6U4jdXI5uoBtKGVMuUnCfSsbHP4pxgdvtqaInTeNuo-5JhfuQHvYk8fCF2aRW9NRVKCWlG7XrYDPFRYtydzQWKXsziTY62rV0410HsWjB8W_pm2jccDkujKdO_336c8Kwj7eQQN5wPZtaz_wK37tTpCDMi8PXS08a0Fjo9k74fAp_ZCyTE7dMegDRaZaFBDlbJuXq5ne3-lXcodOWqf7XnltLq5rpl6_2dMRwzrTBPO18JlcwYxfIz_idNK1-scsO3mnO4W7o7iYcyr6nMIpSPF5Fyj0AJdMhCMssqNkLZlaWL4Lg2-G15kmCRpx8aXDyzlXB9oLsuMvMsWp9wBweXeUH54duXw68swvMF5qmx4aq50UDBS6vEH9lrb9NtABjiBsh1s_leis4mqRu2j5GF6_OWTWyzXEKwgqIpSNXvVs0EQcqXl2nMYVsjgghL7sa_GQ4zttYmGGclXLrfAUBdgGzcDeWgfPtcwLQeQuS3rNRm0udRkYS9opgGDBjxgWBzJIXs6zQ8aR2bXGh8PB7cATS-L1BFZ66S9EHxx47CwYJs5d-f5d-oZbdAgHTmOu-0-EGnK7J5n_ORoOoELf6z6O_y1eiXB3RBHzX1rj96ypf77sbLBHdwtyNZLdaAkYZb6aO01XwqtDZh02MvOc-N3psjyFHBN-PRI3nTpn9Qt5xcKfuHQv5E6Cm-v9U1gUFLQyUAzkOUqTI2iMXnJIeCAiXV0J9pThKyqZNztdeZzi4Xv9scm6QF11s8FjBjtxlkMQG_B8iEBTtYaWGATa7smzuLTFSQQSqnFCcUG8PACdm8qRcdFIDgW7WneFz0jW2A7ahQsdbPYQn7Rf9XR9I89jz8mr1kjV5KvfyIojusTKwOYADsfRizymRmamWWAJThtOQmkwejU_EFkrLmMxfepBaQEDyJASb3Z_3CK9l8ayTcoRRrTo3nVV9MsyI0l9qXzjKutuzyWsvyazeQh8XQgO7lS67fD60ZwfCquN5_PaNUVq5uyALzq1YlM1Jc8JEHKhmOe_8r0prsHOXoQ83V-CS3X9U0WHvK-RdwSsesoSGmXYrnGXuTbAe6F5giaYHOrjllsNeyy7p-RdGXNCwlMP_ss.f9ZGAipr9mfP82zZlpMlEQ
+eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.zOg0DGxMxQo5C1Ghzzrd8mTWj2jw7uvCUrIXhwTggi46026frzeFoM0woB7f13Mcz5W7ycYoCdnY1vEDUNSGt6duMiAcwaFNKjz8vVHkv-m2OpKUyB7lwiaehx8Mdr3B5UHIlGPU7wd36WxQl4uXb9QI0yvIQQb9WlC_bal3awMObUQp6FXZiXeGFzN_zEEOmJo00jsemmqjpoRDmXmUuXbV-a06_Cw6V2k1X8PKm6Vo5Wx_uEUFMIfmQSoUuzjyv7qeLjmoQDDvJa4L8REb5k9WlMooZ4CUhYkCsMQROj3XswM4Q_uWB8VLLgDDPy4AzzLdPG8dwPMtw2s4CENSyQ.jTCVLlb5IQjZCapR.OHZjLZCWZd_os2xu2X1AZio-U_NnCktVLrFLl1OAulo5YsgY68y-iorZq5T0MzKtmqlhL7HlM9QStv8ewIYhSZUiFxC7qy_kBgCHgmEXeJl1jUHDEVZsjRJIccptJwU6kB00whAP5efqAXvd8QqST3TVDPf-Igf4xYhgvn06MPp6b778YFwQhiyQEeyd9DRfgK6KdE6SSA-8JLklk15jyZs6cgEAbhyk3T2hW8mkaxrCmeXDYUSHdHtHfW3jM8qWr-qAZdgtnuav9c7qtjMztC5upmVTXbtFYVYqe9o_JDWmtdAtbtV8UtUkxarLFDYvkXM4jWY2Gc3kNcmoXYsQ5cbEXhJfRu_HfjyvVDBDG0yym9S1CPEqbSzQWILE5NOPHgoUI8uYq9CEAlwgczpzGIb9SE5TBGvJRqDxWzQq1lAtY0bX8jZsmHT5zEcyPBpNREz1DbRTRCmNupsWsCTZZWqzCZY-csx4UiySUB0_5pHjiYcWzAVIPHu00GJ8ERxHjBOiqdCN19ynmAOTyXc9f_8r1U5LK3_ouAYIvK8KuV_dvSJuGY4Ro0dWjETtOj-qaDkgbgj2EXuflkE3fxJx-25VIoWSWrDFpZwkVGCb9VDVeq9429Uh08nTyrHPKGiDS1kCKHJXA_J2YR7bpW4rM09k0sbCb-GrUd7R1lpllUIK16udbJYoZg8oQcFLxh5qdC6otixkmqe2WXnTuyKLwcu9tAYFjFCLBOXqe6n9L3viemxUUxqyH0ZOXdqGbyuCAuTrMbkav4rv5pRETv2tuEAtQjmJ14x9QmqLX00C7ng4Wed5Qb7yyMrqYHYkgZ85oTTcMAyzVX6MNqHlGTJyiPe5jxEUl8iGM0hK-IsWNXD37IkiclldLACy9Q3YsE3mVP1JMpfclneIe6xdmSOFFuGoFuGSLsL2UlIYMaaP51UCMRcHYLL-SELqLsf3cP-BMt3l1A2IRGoqbD3xCANQhvMRDhkUJK3n3APcUS_UyEhfis0C-jYtLUltP9wm8xgLlTlUySmTiBEbvMvZmDLQEMAmMHkF48BArMmCogzkraPnfay1aTbNQ7KYTf5_IVYfAd6VOmPMCht3Wv--LmsYJWN87Jw0MmbQuoAcurfNUMWdiyxvtd-VK23IZ96H8yZCe-A_NeM84SqtLKR_OyJlrdqWXfxCpoeWYyNhSyBHALFmwmX8jgP3srePGsSXLa4x6h9ODED5peeADS_P_fZ3QIbdeAzPRxNkFEFkwnxQyuleCSit_SgRkMBVyhUx_PVaDM-Oepkprjs67eBfhxqm4BzdnoVYpg7r0FjpKTx1KmPmrivDbFhZWlsbaf2Ykvdj5xd4RaYHmUBHV7-v4OtfRlG57rkP8Dss7nA8GeNhD7uqcuPHZ1i2zbuoq9D9OZKst5bPdRDLYGhexzJqV8SuzzSyUN3NLwSobXPOoRucXnB1R-6IrtOUJGA9VJNIfYmwgL0pcSkogfqNXQrJuZ_4iAE5WdMX9T99r2Ia21qrfMMD4ONg5PvDcdUhTj9ieDykMuCofw3OOeX6t4ntTTd-sGkhnJudQmWc7KJCBQcQdpqe_7LuZhasz_s_-DLvpSnGXhSmR3lGl5IMCguzauLpzVdseFVq-BPWz2yofT83gWW7ZrcLOe-iGdHSVP2j9qCI4VsVksebQzyruxcLX1q9GaNlp3l5XJq0NzTXbtbMgUTm3ssjSbe5sOG_BjH3MH1CF7Exdtaetct-e6DQNC_GsKxJUAlVsZ1nhVVW3uL9fXsRh3CzRX7-xAgjiJOLxkU955dXWREWdoMPQQvcQ7pg80MFrCvRJj3LS_EnL2ADwd3xjiCEn8iouuqDYx9CNx7q2XCFBtEQ4fhps5FEXOM9STThFxAOqbXc9U8uIglmf_OyrI3dwUzkuKvZqBqK4XDo2BoqLNATAskGwSPRdJ8o8uzZiGIlJeOHaz47T8D40IUS6xgoH71YqsgasKl6FiqoM2zOJ5tw9-7b3CLsCXMwTdqlLLmc4bnj7hVxjlm1BqlEQkdzVaEkerp4vuf0Fld5B22YwS1j0DLldvt-iGcT7oKcTysC2HCGfBaJFBHitQWnipwN3dXOvekkySR9sUrbK3GaDWcCnakjVgnpYBxtXTJKyKwBKzipPkPddfb78539Yh1G5IEMWNP5gxKQKsr-sEiHY-0pjVwn63RssjuNgmRfG7HOz9Qtb9V8Ujt5um3UDZ40zDtD51A7XPLp6Q0tLUGjqnkd4etygBXhLK2J5IfncNwQcTLf6W0So_15s7ZwuaJDD72OCXP5wMFkn6YKzAQP1AaBQyazlTvt1OaHZMYMKOQuPOu04Hyvx7yD2zcRLFMF79PHJdBCEZgI6qGcUTQWbkpn59Xg_wqYUGMzZxtv4tq30IVfVAzIpuXgA5vu9yh39m3E-AxWuU1P3Tq3DtrgnYDyb3E8L-80UWaTaGbc_umu220cAPoGz3yfKjC3hR7o6wf0oEsmAIO1lYn3tT86imyp255Hl_uCtHtFoMr794ZSUS_qSwAt5Vfz_IyrQ5qLpIg9xJp7q7kibJiP1oOzJg3H1eVU6ti510BFYh0xK2yk4G-m9YXwM5CPOxhRFiQ3mHwXwmHUtPUa-Qd9h4nB6KkbPe-9Cr-Q3ZflqVVMwGK6_bmZoExFwzY9Rv5AHRwl_N1W5G3v9xsvzHOQ4uJb-XHopv2UdqEZJpuaQQ678GNqPdXkcUxuLE6MPOJ3-XxA-XNWXXkEF8QfZMZOtbZBVqkt3i9NLolSu7BAbe2t6bUj7Gt3axKGFMATFgykuqu3iviyOAeQsTiRMMqHyYxqkHx_PUIebqdXI9wXD4UBq6D74cUhyBYHeC_mMQuHNuWMMR300ENcaP0qQvHBGohmuf_ra_T-boC0JfHosUKtUs7XP0xaFTDdJYDkfVzu91Je5ZV7A0mavqRMERf2ZYsnB0Sk_T0m4pg2zm-pHzJHSHcD-r95wCS-A9CK1pJigFXkyztJQDwt-wHcEEVespz-tqS1uK7vfBReXQpMfnRIxMWAJ-W7nbZtIMzicPWQMGd-RzSAZTKO-ubsjA7MAk4_5mgLN3A1vbD0nbzwjZExPg8zU9T9nAmTT1yyz-BAAPDaCgvET_VNTEYTnZPZwEHghV9z_lUbzVXHPYUHZ8bicJt_yCn7_GWGxQ9W1fmh2m0IXrgIOOddqqOkcYcN1zJfQA6yJJeyZcpOkRk8iigzN-kjejSsVy4AEt8azdAXph9mT44bNBpX0OMIW5QSjfN6qkwxSgppi6nPySBlHYfGg_TD3EVeeq2mSEsA2XZSIV9tBZgDfePt2LmIn8yolPR49nwlHUFFBIsEIpledV6m0tMq_9OTUmdrz2Ho3WQHd3XfrsATgFWqOcXzi40g8ecG3Immhvlpo64lFQYP-G9NOYu5ZjXsneIU0cNju_GnLPCJbYxy9kDA3SDJ_BaKqed5PDHFc4brCVvsVyptwpsP3LIUeQSdi3NyQcG_JpspefxgHZPWk1eWwgpsIzmrFyM2XkKYRGwJ6pWacuQvz5_sJZF0roMNdBSypNQ_x2saPTCaVMrkguIY3qNqLkSYlWoE7tbvso4_5XG0I_63zYrvyBAAxp_Ey2r7Tpt67TXYmi0o8rtBMqCsrjkHD80iBrxItFMihUzSRgji1kGLJ-xd37gYj0P4S1JzBX14GmsozFyWuRC9NW4d8XnZo5FNnIm9ibtdwq8g7s6s40eXOmOiMBKEDgmGg7o9JMHJd7VbVrq-xVXUsWrNAwO1TaEW-K4ZtTt7-PSDBqG7kMjdaK0uCPSz4ZO9egFC7_-GUjsXpqnJ00h6ziXjtUvHi9WgRlvFz8CdAy756UVwYBCqHJYbrAhEd7693MdHUrrbK890LKzWc1UaXgzpjc60Jq_VCFFoXsTkbtGNIgi76HBV9b2N6aIoYvCYCD6M-beDqu93BMZYCdjwpQ.Wqy6Lwem83zgypW981c5GQ

.drone.yml

@@ -6,24 +6,33 @@ build:
 
   serialize:
     image: cnastorage/vibauthor-and-go:0.9
-    environment:
+    environment: &setup_env
       - DRONE_TOKEN=$$DRONE_TOKEN
       - DRONE_SERVER=$$DRONE_SERVER
-      - TEST_URL_ARRAY=$$TEST_URL_ARRAY
       - GOVC_USERNAME=$$CI_BASE_VMWARE_ESX_USER
       - GOVC_PASSWORD=$$CI_BASE_VMWARE_ESX_PASS
+      - GOVC_USERNAME_ESX=$$CI_VMWARE_ESX_USER
+      - GOVC_PASSWORD_ESX=$$CI_VMWARE_ESX_PASS
       - GOVC_INSECURE=1
       - GOVC_URL=$$CI_BASE_ESX_IP
-      - TEST_ESX=$$CI_ESX_NAME
+      - TEST_URL_ARRAY=$$CI_ESX_IP_6_0
+      - ESX_6_0=$$CI_ESX_NAME_6_0
+      - ESX_6_5=$$CI_ESX_NAME_6_5
+      - GOVC_URL_6_0=$$CI_ESX_IP_6_0
+      - GOVC_URL_6_5=$$CI_ESX_IP_6_5
+      - SSH_KEY_OPT=-i /drone/src/github.com/vmware/docker-volume-vsphere/key
+      - GOVC_GET_IP=govc vm.ip -a -v4
+      - KEY=$$KEY
+      - ESX_6_0=$$CI_ESX_NAME_6_0
+      - ESX_6_5=$$CI_ESX_NAME_6_5
     commands:
       - misc/drone-scripts/validate-and-serialize.sh
 
   build_dev:
     image: cnastorage/vibauthor-and-go:0.9
-    environment:
-      - KEY=$$KEY
-    commands:
-      - pwd
+    environment: *setup_env
+    commands: &build_cmd
+      - if [ "$TAG" != "" ]; then export PKG_VERSION=$TAG; fi
       - go get github.com/golang/lint/golint
       - make -s build
       - echo $KEY | base64 -d > /drone/src/github.com/vmware/docker-volume-vsphere/key
@@ -33,15 +42,8 @@ build:
 
   build_tag:
     image: cnastorage/vibauthor-and-go:0.9
-    environment:
-      - KEY=$$KEY
-    commands:
-      - export PKG_VERSION=$$TAG
-      - echo $PKG_VERSION
-      - go get github.com/golang/lint/golint
-      - make -s build
-      - echo $KEY | base64 -d > /drone/src/github.com/vmware/docker-volume-vsphere/key
-      - chmod 0600 /drone/src/github.com/vmware/docker-volume-vsphere/key
+    environment: *setup_env
+    commands: *build_cmd
     when:
       event: tag
 
@@ -52,70 +54,69 @@ build:
     when:
       event: [push, pull_request]
 
-  package:
   package_dev:
     image: cnastorage/fpm
-    commands:
+    commands: &package_cmd
+      - if [ "$TAG" != "" ]; then export PKG_VERSION=$TAG; fi
       - make -s deb rpm
     when:
       event: [push, pull_request]
 
   package_tag:
     image: cnastorage/fpm
-    commands:
-      - export PKG_VERSION=$$TAG
-      - echo $PKG_VERSION
-      - make -s deb rpm
+    commands: *package_cmd
     when:
       event: tag
 
   setup_pr_tag:
     image: cnastorage/vibauthor-and-go:0.9
-    environment:
-      - GOVC_USERNAME=$$CI_BASE_VMWARE_ESX_USER
-      - GOVC_PASSWORD=$$CI_BASE_VMWARE_ESX_PASS
-      - GOVC_INSECURE=1
-      - GOVC_URL=$$CI_BASE_ESX_IP
-      - TEST_ESX=$$CI_ESX_NAME
-    commands:
+    environment: *setup_env
+    commands: &setup_cmd
       - misc/drone-scripts/setup.sh
     when:
       event: [pull_request, tag]
 
   setup_push:
     image: cnastorage/vibauthor-and-go:0.9
-    environment:
-      - GOVC_USERNAME=$$CI_BASE_VMWARE_ESX_USER
-      - GOVC_PASSWORD=$$CI_BASE_VMWARE_ESX_PASS
-      - GOVC_INSECURE=1
-      - GOVC_URL=$$CI_BASE_ESX_IP
-      - TEST_ESX=$$CI_ESX_NAME
-    commands:
-      - misc/drone-scripts/setup.sh
+    environment: *setup_env
+    commands: *setup_cmd
     when:
       event: [push]
       branch: [master, runci/*]
 
   test_dev_branch: # Identical to test except for when it occurs
     image: cnastorage/vibauthor-and-go:0.9
     privileged: true
-    environment:
-      - GOVC_USERNAME=$$CI_VMWARE_ESX_USER
-      - GOVC_PASSWORD=$$CI_VMWARE_ESX_PASS
-      - GOVC_INSECURE=1
-      - GOVC_URL=$$CI_ESX_IP
-      - SSH_KEY_OPT=-i /drone/src/github.com/vmware/docker-volume-vsphere/key
-    commands:
-      - pwd
-      - export VM1=`govc vm.ip photon.ga.vmfs`
-      - export VM2=`govc vm.ip Ubuntu.1404.vmfs`
+    environment: *setup_env
+    commands: &test_cmd
+      - GOVC_USERNAME=$GOVC_USERNAME_ESX
+      - GOVC_PASSWORD=$GOVC_PASSWORD_ESX
+      - if [ "$TAG" != "" ]; then export PKG_VERSION=$TAG; fi
+      - echo
+      - echo "=> Running tests on ESX_6.5" `date`
+      - echo
+      - export GOVC_URL=$GOVC_URL_6_5
+      - export VM1=`$GOVC_GET_IP photon.vmfs`
+      - export VM2=`$GOVC_GET_IP Ubuntu.16.10`
+      - ./misc/drone-scripts/deploy-and-test-wrapper.sh $GOVC_URL_6_5 $VM1 $VM2 $$BUILD_NUMBER < /dev/null
+      - echo
+      - echo "=> Running tests on VSAN ESX_6.5" `date`
+      - echo
+      - export VM1=`$GOVC_GET_IP photon.vsan`
+      - export VM2=`$GOVC_GET_IP Ubuntu.14.04`
+      - ./misc/drone-scripts/deploy-and-test-wrapper.sh $GOVC_URL_6_5 $VM1 $VM2 $$BUILD_NUMBER < /dev/null
+      - echo
+      - echo "=> Running tests on ESX_6.0" `date`
+      - echo
+      - export GOVC_URL=$GOVC_URL_6_0
+      - export VM1=`$GOVC_GET_IP photon.ga.vmfs`
+      - export VM2=`$GOVC_GET_IP Ubuntu.1404.vmfs`
       - ./misc/drone-scripts/deploy-and-test-wrapper.sh $GOVC_URL $VM1 $VM2 $$BUILD_NUMBER < /dev/null
       - echo
-      - echo "=> Running tests on VSAN"
-      - echo "=>" `date`
+      - echo "=> Running tests on VSAN ESX_6.0" `date`
       - echo
-      - export VM1=`govc vm.ip photon.ga.vsan`
-      - export VM2=`govc vm.ip Ubuntu.1404.vsan`
+      - export VM1=`$GOVC_GET_IP photon.ga.vsan`
+      - export VM2=`$GOVC_GET_IP Ubuntu.1404.vsan`
       - ./misc/drone-scripts/deploy-and-test-wrapper.sh $GOVC_URL $VM1 $VM2 $$BUILD_NUMBER < /dev/null
     when:
       event: [push]
@@ -124,47 +125,16 @@ build:
   test: 
     image: cnastorage/vibauthor-and-go:0.9
     privileged: true
-    environment:
-      - GOVC_USERNAME=$$CI_VMWARE_ESX_USER
-      - GOVC_PASSWORD=$$CI_VMWARE_ESX_PASS
-      - GOVC_INSECURE=1
-      - GOVC_URL=$$CI_ESX_IP
-      - SSH_KEY_OPT=-i /drone/src/github.com/vmware/docker-volume-vsphere/key
-    commands:
-      - export VM1=`govc vm.ip photon.ga.vmfs`
-      - export VM2=`govc vm.ip Ubuntu.1404.vmfs`
-      - ./misc/drone-scripts/deploy-and-test-wrapper.sh $GOVC_URL $VM1 $VM2 $$BUILD_NUMBER < /dev/null
-      - echo
-      - echo "=> Running tests on VSAN"
-      - echo "=>" `date`
-      - echo
-      - export VM1=`govc vm.ip photon.ga.vsan`
-      - export VM2=`govc vm.ip Ubuntu.1404.vsan`
-      - ./misc/drone-scripts/deploy-and-test-wrapper.sh $GOVC_URL $VM1 $VM2 $$BUILD_NUMBER < /dev/null
+    environment: *setup_env
+    commands: *test_cmd
     when:
       event: [pull_request]
 
   test_tag: 
     image: cnastorage/vibauthor-and-go:0.9
     privileged: true
-    environment:
-      - GOVC_USERNAME=$$CI_VMWARE_ESX_USER
-      - GOVC_PASSWORD=$$CI_VMWARE_ESX_PASS
-      - GOVC_INSECURE=1
-      - GOVC_URL=$$CI_ESX_IP
-      - SSH_KEY_OPT=-i /drone/src/github.com/vmware/docker-volume-vsphere/key
-    commands:
-      - export PKG_VERSION=$$TAG
-      - export VM1=`govc vm.ip photon.ga.vmfs`
-      - export VM2=`govc vm.ip Ubuntu.1404.vmfs`
-      - ./misc/drone-scripts/deploy-and-test-wrapper.sh $GOVC_URL $VM1 $VM2 $$BUILD_NUMBER < /dev/null
-      - echo
-      - echo "=> Running tests on VSAN"
-      - echo "=>" `date`
-      - echo
-      - export VM1=`govc vm.ip photon.ga.vsan`
-      - export VM2=`govc vm.ip Ubuntu.1404.vsan`
-      - ./misc/drone-scripts/deploy-and-test-wrapper.sh $GOVC_URL $VM1 $VM2 $$BUILD_NUMBER < /dev/null
+    environment: *setup_env
+    commands: *test_cmd
     when:
       event: [tag]
 

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

@@ -88,7 +88,6 @@ INCLUDE_HOSTD="false"
 
 if make -s deploy-esx deploy-vm testasroot testremote TEST_VOL_NAME=vol.build$BUILD_NUMBER;
 then
-  dump_logs
   stop_build $VM1 $BUILD_NUMBER
 else
   log "Build + Test not successful"

misc/drone-scripts/setup.sh

@@ -14,10 +14,20 @@
 # limitations under the License.
 
 echo "Resetting testbed"
-govc snapshot.revert -vm $TEST_ESX init
+govc snapshot.revert -vm $ESX_6_0 init
+govc snapshot.revert -vm $ESX_6_5 init
 
 echo "Waiting for revert to complete";
-until govc vm.ip $TEST_ESX
+
+echo ESX 6.0
+until govc vm.ip $ESX_6_0
+do
+    echo "Waiting for revert to complete";
+    sleep 1;
+done
+
+echo ESX 6.5
+until govc vm.ip $ESX_6_5
 do
     echo "Waiting for revert to complete";
     sleep 1;

misc/scripts/commands.sh

@@ -44,8 +44,9 @@ VIB_LIST="localcli software vib list"
 VMDK_OPSD="/etc/init.d/vmdk-opsd"
 
 function log {
-    echo 
-    echo "=> $1"
-    echo "=>" `date`
+    echo
+    echo
+    echo "=> $1" `date`
+    echo
     echo
 }

vmdk_plugin/Makefile

@@ -93,8 +93,7 @@ SRC = plugin.go main.go log_formatter.go refcnt.go \
 # Canned recipe
 define log_target
 @echo
-@echo "=> Running target $@"
-@echo "=>" `date`
+@echo "=> Running target $@" `date`
 @echo
 endef