This repository has been archived by the owner on Nov 9, 2020. It is now read-only.
Optimize installation steps on CI (#1313) #1345
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shuklanirdesh82
force-pushed
the
optimizeInstallationScript.shuklanirdesh82
branch
3 times, most recently
from
17f78c7
to
443d3ef
Compare
pshahzeb
reviewed
Jun 5, 2017
| @@ -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) | |||
There was a problem hiding this comment.
So all these are VM envs. Why are the names different? Am I missing something?
There was a problem hiding this comment.
Yeah all are VM env vars. WORKER2 meant for the third VM node part of swarm cluster. CI_NODE4 was added to simplify installation process.
this will be simplified further as part of #1274.
shaominchen
reviewed
Jun 5, 2017
.drone.sec
Outdated
| 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 |
There was a problem hiding this comment.
Can we avoid including this file in the PR? It looks like this file always shows up in your PRs :)
There was a problem hiding this comment.
it is required to sign the .drone.yml for the security purpose, otherwise CI fails.
There was a problem hiding this comment.
Why don't others run into the same issue?
There was a problem hiding this comment.
anyone who touches .drone.yml they are required to add .sec file as well ..
.drone.yml
Outdated
| - # | ||
| - 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` |
There was a problem hiding this comment.
Since we are using variable name in above line, let's also use variable name (i.e. $WORKER2) in this line.
| @@ -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` | |||
There was a problem hiding this comment.
How are we going to use this new VM? Just want to know if we can have a better name for this VM based on the usage info (what tests need this new VM?).
There was a problem hiding this comment.
CI_NODE4 is used as part of the second run running tests on ESX 6.5 VSAN
The variable is added to simplify installation ... there is no need to retrieve or use this new variable other than installation
shuklanirdesh82
force-pushed
the
optimizeInstallationScript.shuklanirdesh82
branch
from
443d3ef
to
6f1fdc6
Compare
|
@shaominchen Addressed one comment and CI is running now. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes first action item #1313
Our deployment scripts performs installation/cleanup for VIB and plugin multiple times while running against CI.