-
Notifications
You must be signed in to change notification settings - Fork 27
fixes #228 dvp build should support "start hooks run at enable time" flag #239
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
8073a1f
80fdf42
c87d730
310fe90
8680605
66f2615
659fa0b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.1.0.dev3 | ||
2.2.0.dev0 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=5,IE=9" ><![endif]--> | ||
<!DOCTYPE html> | ||
<html xmlns="http://www.w3.org/1999/xhtml"> | ||
<html> | ||
<head> | ||
<title>Draw.io Diagram</title> | ||
<meta http-equiv="refresh" content="0;URL='https://www.draw.io/#G1ElT8DJD5QH8kzMbz85S95KI6mnwQtmEg'"/> | ||
<title>disable</title> | ||
<meta charset="utf-8"/> | ||
</head> | ||
<body> | ||
<div class="mxgraph" style="max-width:100%;border:1px solid transparent;" data-mxgraph="{"highlight":"#0000ff","nav":true,"resize":true,"xml":"<mxfile modified=\"2019-03-18T01:10:35.272Z\" host=\"www.draw.io\" agent=\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36\" etag=\"gfhqW0cUHT1rRxW5FEZE\" version=\"10.4.9\" type=\"google\"><diagram id=\"-ZfKtbs5jN34PJB2tePp\" name=\"Page-1\">5VbRbtsgFP2aSNvDIgcnjvPYJl0nTZMqZV3WR4KvbTRsMoybZF8/CGDj2F3XLdMmLZUq7uFygXMO4FG4LA63Au/yDzwBNkJBchiFqxFCi0ms/mvgaIBpPDVAJmhioEkLrOk3sGBg0ZomUHUSJedM0l0XJLwsgcgOhoXg+25ayll31h3OoAesCWZ9dEMTmRs0ngUt/g5olruZJ4HtKbBLtkCV44TvPSi8GYVLwbk0reKwBKa5c7yYcW+f6G0WJqCUPzOg2BSr+J5s7uHje3Idf73bbMQbW+URs9pueIQipupdVztcqnam25+okDXWxda8FgRUY0UrvFUk2eytcLlriYWEpN/hELVCv7YlRx4d45UU/EtDtqLpOpcFU82JXlWOdzqvOGTabuOU8T3J1YxjCaKgJZZcqLR9TiWsd5jo3L3KVFhKGVtypvvVNGGCIU6JLnmaz+uJSAzbtFmaz7CjC9QWDx5kGb8FXoAUR5Vie6cTZIZY+8+QPQ/71kwTZ6bcM1JkMWz9mzWlW4lVw6r8AsVRT/GXqDvkjhUvf5D5j8idphCRQbmT+WKrDu0fkXse/G25w57cj0bucV2qOzOlWS3g1eueLILXZQKJ1WGIYE8mvK04qyVcCWJv8BPaRtOGeF/oc4lm+m/wRJ5+egQvpYeb34WkQ1FHuihEfekQ6kvn8i4uXTRwN5+pBGVypR85FRGGq4qSrjBwoPKzagfjmY0evJ6V3nrggqMNnuSyMrfDs15TD0AG8vkrCJLO09tXxmN+6Mw4TADDkj52H+whNewMd5yqnTXCo0XQEX4xPTuLZt92lP/AnhWaxvPu4Y/PnGGI6RU6maPZ9q/7ZX4Bv5RqCZ5hdPjgTKKD1jKn6OgZ6KU+08EdCKq2DeK3vee+DZ/zXvh/eC9C4YW8p8L2G9Wktx/64c13</diagram></mxfile>","toolbar":"pages zoom layers lightbox","page":0}"></div> | ||
<a style="position:absolute;top:50%;left:50%;margin-top:-128px;margin-left:-64px;" href="https://www.draw.io/#G1ElT8DJD5QH8kzMbz85S95KI6mnwQtmEg" target="_blank"><img border="0" src="https://www.draw.io/images/drawlogo128.png"/></a> | ||
<body><div class="mxgraph" style="max-width:100%;border:1px solid transparent;" data-mxgraph="{"highlight":"#0000ff","nav":true,"resize":true,"toolbar":"zoom layers lightbox","edit":"_blank","xml":"<mxfile host=\"app.diagrams.net\" modified=\"2020-07-27T18:26:11.051Z\" agent=\"5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36\" etag=\"IEQA4UnfT6ZvX8RSBpXp\" version=\"13.5.3\" type=\"device\"><diagram id=\"8-kqrFsy8RDDcg8nNvsf\" name=\"Page-1\">7VjLbuM2FP0aA9NFBIl6L/OaR9GiKQzMTFcFLdESW0oUKCq2+/W9tKgnlYwnceBZjLIIeXhJivccnmt75d4W+w8CV/nvPCVshex0v3LvVgg5juPCP4UcWsT3vBbIBE110ACs6X9Eg7ZGG5qSehIoOWeSVlMw4WVJEjnBsBB8Nw3bcjbdtcIZMYB1gpmJfqGpzFs08u0B/0holnc7O7YeKXAXrIE6xynfjSD3fuXeCs5l2yr2t4Sp5HV5aee9f2K0fzFBSnnKhPhQ0LL+9fPN3388kJR9+vP6S3mlV3nErNEHXqGAwXo3dYVLaGeq/ZkK2WC12Jo3IiHQuKM13kCSdPRGdLFriYUkqTnQIfCG47V1cuShy3gtBf+3Tzak6SaXBYOmo94qx5WKK/aZ0pu1ZXyX5LCjJYmA82HJBYTtcirJusKJit1BJGBbytgtZ2octnFTTKJtopY87jcaCZKIbLb9qz0SOM/+yaQ7PZVwBwgviBQHCNETPAe1Uzr5o6jt7wYxOZ2Y8pGQAo1hrd+sX3qgGBqa5e9gHBmMfw+7S+q44+UzkT8I3dstCZJFutMw3sClfRO6I9e+MN2uQfdjS7fVlOCZW5o1grz7xaBF8KZMSap5WErwiCa8qTlrJLkWiXbwIzr0vD7xY6LnFPnqb/FGHh81g5dyhLfPmahDwYS60F6gDiGTOhe9EXX+gjfPWCJleq2KHPQShuuaJlNi4Ozi8BU6tuVHbgf8BcCVbdk26pA7lQS77x263p5KPdsJdV9Ndizb0d1hpuqMJz4QQSERRIyXnoPtiUhqFOEZbXDq1pu+Wcqg/GREPhMXLMtgRPPSBe0wQRiW9HH6ukvU6x0eOIWD9CpDsT1RWezNLn57TD1rXM1nC3lROFkoQO50oTYPxkIgF3wYhVUqoDa02ifm5fINDPk+CHK1lrwyi8U7XknKS8xMI1KXmsLnsWtGs1LpHISh5DMpE4a1dIUDhIQZI4xD/SgAr0b6m4yNhLnodlM/HFnbcbe2bVtI3bGEF+oeHvU9szjipD4JlywuDkIXB2eyMjuaaWPByrxnRH52KwvPYGWDF0Xe1Its72VmpJdDaG6MzjeN8Y29LDjRy9xLepkXBZY/FVp8JjcLndlCT7jZubzK8U4QKBC71l0uZM4zZVj3AzryCCWHIeY3Dp7XqvgfIuVBWwduJH9a4+5I47YVx6+SuBMbtd+9sMTjEyWOliV+snZf5VuxWcN4LX8WsQsUsdAPLlzEHPO71GuqGJrf8Ndd8Sg0qlhw4SvunnjF44tWsTi04FP48MxKWhi/tKTNvk/6/plKGnSHXw3b8OG3V/f+fw==</diagram></mxfile>"}"></div> | ||
<script type="text/javascript" src="https://app.diagrams.net/js/viewer-static.min.js"></script> | ||
</body> | ||
</html> | ||
</html> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=5,IE=9" ><![endif]--> | ||
<!DOCTYPE html> | ||
<html xmlns="http://www.w3.org/1999/xhtml"> | ||
<html> | ||
<head> | ||
<title>Draw.io Diagram</title> | ||
<meta http-equiv="refresh" content="0;URL='https://www.draw.io/?state=%7B%22ids%22:%5B%221FnLSP-dOiLAaqH-rlW5kZYU2utVpn8ca%22%5D,%22action%22:%22open%22,%22userId%22:%22110114316315334056404%22%7D#G1FnLSP-dOiLAaqH-rlW5kZYU2utVpn8ca'"/> | ||
<title>enable</title> | ||
<meta charset="utf-8"/> | ||
</head> | ||
<body> | ||
<div class="mxgraph" style="max-width:100%;border:1px solid transparent;" data-mxgraph="{"highlight":"#0000ff","nav":true,"resize":true,"xml":"<mxfile modified=\"2019-03-31T23:00:14.170Z\" host=\"www.draw.io\" agent=\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36\" etag=\"mcP3AlbGPUOvhFV9SQxh\" version=\"10.5.9\" type=\"google\"><diagram id=\"-ZfKtbs5jN34PJB2tePp\" name=\"Page-1\">7Vptj9o4EP41SO2HrvKe8HEX2O6q6mkl2t71vpxM4gTrQowcs0B//Y2JTV4cFpYmsD2VlVA8Ho/teR7PTLwM7NFi85Gh5fwzjXA6sIxoM7DHA8vy3QC+hWBbCJzALwQJI1EhMkvBlPzAUmhI6YpEOK8pckpTTpZ1YUizDIe8JkOM0XVdLaZpfdYlSrAmmIYo1aV/kojPC2ngGqX8AZNkrmY2DdmzQEpZCvI5iui6IrInA3vEKOXF02IzwqnwnfJLMe7+QO9+YQxn/JQBD5+frLvtxPfW3uPDx09f/b/D+Qdp5RmlK7nh29GXx2+TgTB2D9+PfyjBbg98qxyTc0b/3fvEHNh3c75I5SPsdSn0FptEsOImTuk6nCPGbyIckpzQDJTWc8LxdIlCobkGPZDJ5WDG8ebgPs2994B1mC4wZ1tQkQNsT1JOMs5WiKxL/PYozavYKSGSnEn2tku3woP07Cu8bGle/kYYXyExcEpXDDxgGZMMzcC5lpfCeu5mDJ4S8TTl4DccqY58iTLVpSsrCSyzrvgietap6HHMFiRDnLID+MUkTUc0Ff0wjR0hHMShMLmbr9LjhQGexR0h7tg1xIctgLstgHt94W3/DN5tQI9p9oLmGwE7jrEXtoId+cMZHK6OwLZqYHv2tdF2NLQ1BHAW3YpkBK0wRXlOwjoIeEP4X/Bs3Liy9b3SMxZbN1RjW2k8YUZgE5gpWQYbqhgSze/VvtLUrqVsFQvGkZYLG6jApgr6Ho11ELQSzF/KPE47zBUY21BUMoZTxMlzfb1t0MoZniiBnZQscgPwUC1NuG7dSLFTOa6aVzVTw0a+aRgqXKEZ2nFtv/Hz6edq9DuYs+HU8TrxGM7Jj10cKoiwFKvcrdu9G7hjkKAVp3lRlokBKCUJJO9ximNhShxlAtXSrRRzuixCV0iy5ItojOF8dHPwDafu55aD77cwxurr3HsHa6f/k9udwDjqdu+Sbvc1tz8XyfVmQVcZ/ydfQokZg3c4lJnv3mtoMNCKcCQd25bXKkChWU7TFce3LJxW0Chbzj7fVfNrMzO64q+1DNp9xAia8Yq8+HSDoGX6jVjnGMOWnOnrINpWTyAOO8yZlYxZ5s9fKmeqF9tjOdO/ZsqEd/kGjXy3ccZPTpmWZqr57nUgaQIj0LaiJgPn4UUPmzPZbu01GR4Km53mZHV7cSK/M1Het5Lb/GlyR/dErL0Xyl6Nihp/huaZVHTtpimnyeqOqKjPdBkq6lc851HxVe8mvdHOuyrvNAg9/0zeOUbTlNs01VkI9A7M1C/v9EuQV/LuLA5dixonxJG3Rw190Zehhn5jokr4nCO+yn9X7RBq/Po9195Ehc/DFj73VrKb+kXDSwe6vWY/s9betbTa5ozE1GUqkiw+ftN11ZTlaCkrODMu6bX0/u71Qlddpn7logIHwyHNYpKsGP4dPUSl0rzfdIa2Fj9MdaYvE0D0m5vLBZDrxgr/1FBx1fLW1A643/ynycmxQgs7fvMNre9YEbyxdHU6nY7SxL4mSxztOlErT09mSdAfS6BZ/raiUC9/oGJP/gM=</diagram></mxfile>","toolbar":"pages zoom layers lightbox","page":0}"></div> | ||
<a style="position:absolute;top:50%;left:50%;margin-top:-128px;margin-left:-64px;" href="https://www.draw.io/?state=%7B%22ids%22:%5B%221FnLSP-dOiLAaqH-rlW5kZYU2utVpn8ca%22%5D,%22action%22:%22open%22,%22userId%22:%22110114316315334056404%22%7D#G1FnLSP-dOiLAaqH-rlW5kZYU2utVpn8ca" target="_blank"><img border="0" src="https://www.draw.io/images/drawlogo128.png"/></a> | ||
<body><div class="mxgraph" style="max-width:100%;border:1px solid transparent;" data-mxgraph="{"highlight":"#0000ff","nav":true,"resize":true,"toolbar":"zoom layers lightbox","edit":"_blank","xml":"<mxfile host=\"app.diagrams.net\" modified=\"2020-07-27T18:24:48.685Z\" agent=\"5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36\" etag=\"YgVpqTCTXyGi0B7-PypJ\" version=\"13.5.3\" type=\"device\"><diagram id=\"JZMjSxPrt3WQ65kFyIVw\" name=\"Page-1\">7Vpdb6M4FP01kWYfGoHN52PbtLuzq11Vymg6fVq5YBJrAEfGaZL59WvzkWBMGkpJmB01lSp8MRf7nuN7LoYJvE22vzO0Wv5NQxxPgBFuJ3A2AcC3HPFfGnaFwXJAYVgwEhYm82CYkx+4NBqldU1CnCkdOaUxJyvVGNA0xQFXbIgxulG7RTRW77pCC6wZ5gGKdesjCfmysHq2cbD/gcliWd3ZNMozCao6l4ZsiUK6qZng3QTeMkp5cZRsb3EsY1fFpbju/sjZ/cAYTnmXC3D0uPRnj3/Odpvv37wfj38ly6er0ssLitflhK9vv3z+ejeRzu7F/8//VIZ8DnxXBSbjjH7fx8ScwJslT+LyUMx1Jfsl24VkxTSK6SZYIsanIQ5IRmgqOm2WhOP5CgWy50b0E7ZyOJhxvD06T3MfPcE6TBPM2U50KS+AjldcUjIOVohsDvjtUVrWsauMqOTMYu/7EFZxUEb2DVEGWpS/EsbXSF44p2smIgCMuxQ9i+ACJxbjuXlm4mghj+ZcxA2H1YlshdLqlN65sohhqh1fRQ90RY9jlpAUccqO4BeROL6lsTwvbgNDhL0okC7z+9XOOIGHn6OBELeggrjfArjdArhzLrzhe/BuA3pG01d6/iRgRxF2glawQ9d/FovrLGC7cGy0LQ1tDQGchtdSjEQriFGWkUAFAW8J/yaOjaldtp5qZ2Zy6kbV2NUaD5gRMQnMKlsqJlRzJJtP9XMHV3mr8lUMGIeaFjZQEZMq6Hsy14mktcD8NeUB7TDXYGxDsbIxHCNOXtTxtkFb3uGBEjGTA4tsT0RIkQnbVp0UMy2vq+uq5spv6E3DUREKzVHOtf3E+9PP1uh3VLPFquMq8RjOyI88DxVEWMlR5uO2byb2TFjQmtOsKMvkBSgmCyHesxhH0pVcykRUS9elmdNVkboCki6+yMZMrI9hFr5hqXFuWfhuC2PAuda9c7R2+pXCbnnGybA7lwy7q4X9pRDXaULXKf83W4kSMxLR4aLM/PSbhgYTvUIcloFt07UaUOg5o/Ga42sWzGtoHFrWXu/q+tpURlv+tZZB+U9eQVNesxe/YRAEpqsgaLltiunqEEJwJgi9ARWzppcH9fxfKWb1WHtKMYE3pmIC124opms3lnhXxQS+o6YUr+HoiGIKQqBdrVuZNY8P2W8OGdrKM7I4KHwOKsj+m9idytK+ldrmu6kd3hM59LMQdjQegiaovtmThzZUeWj55+GhDUfhYRWW/kTsRaDRiOGrMudYPWlhAbXicc6WntzW+5yXFPqO369MCn3paYv8Z6NFMytdhhZAo0VVVWcc8XX2UUiLrO0CBZm9ixqX/RYun62ONvWNxtcWc3sh3bMAzltaydFjH6trCulSmHTefBpVqKxmTtJSSfdKWnMFu2WlwRKHvvtZJQ6GA5pGZLFm+CN7APmYoyBlt21cm/Yl04e+dXi59DFupnC7JgprzExh+uri9pouOucJq/Ho7jYcnTtL6Hul4wpVdyqdpAgckyGWqSaV/kriads7HevboTgC9F3BB4av8tff+rvPT3Ql93dRrCtLc3M8EJBK4JW3nppWVO9BBQVQHOOYLhhK5NZ8jTnKuRqlWuVLFbiaVuV3K46NKZDqEtBEsj1nZkOzsBna2G3TLN9xIXIG0iZtUwW2vUS3XiHy8B9NvG0fbdCc0TU9jLfX0Xio7bvXoTmqHnEutOihvh3xQDP+seovsuobL4bs0dd8VeoOteYdq77qr4ypYZ1Y+b2+xHhfhXH6sdbqWoqMmpSg0RQR22xkk87fVOiumhmud2ISzcNHl0X3w5er8O4/</diagram></mxfile>"}"></div> | ||
<script type="text/javascript" src="https://app.diagrams.net/js/viewer-static.min.js"></script> | ||
</body> | ||
</html> | ||
</html> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.1.0.dev3 | ||
2.2.0.dev0 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.1.0.dev3 | ||
2.2.0.dev0 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.1.0.dev3 | ||
2.2.0.dev0 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.1.0.dev3 | ||
2.2.0.dev0 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -172,9 +172,10 @@ def artifact_file_created(): | |
def plugin_config_content(plugin_id, plugin_name, external_version, language, | ||
host_types, plugin_type, entry_point, src_dir, | ||
schema_file, manual_discovery, build_number, | ||
lua_name, minimum_lua_version): | ||
extended_start_stop_hooks, lua_name, | ||
minimum_lua_version): | ||
""" | ||
This fixutre creates the dict expected in the properties yaml file the | ||
This fixture creates the dict expected in the properties yaml file the | ||
customer must provide for the build and compile commands. | ||
""" | ||
config = { | ||
|
@@ -220,6 +221,9 @@ def plugin_config_content(plugin_id, plugin_name, external_version, language, | |
if lua_name: | ||
config['luaName'] = lua_name | ||
|
||
if extended_start_stop_hooks: | ||
config['extendedStartStopHooks'] = extended_start_stop_hooks | ||
|
||
if minimum_lua_version: | ||
config['minimumLuaVersion'] = minimum_lua_version | ||
|
||
|
@@ -281,6 +285,11 @@ def build_number(): | |
return '2.0.0' | ||
|
||
|
||
@pytest.fixture | ||
def extended_start_stop_hooks(): | ||
return False | ||
|
||
|
||
@pytest.fixture | ||
def lua_name(): | ||
return 'lua-toolkit-1' | ||
|
@@ -579,6 +588,7 @@ def basic_artifact_content(engine_api, virtual_source_definition, | |
'rootSquashEnabled': True, | ||
'buildNumber': '2', | ||
'luaName': 'lua-toolkit-1', | ||
'extendedStartStopHooks': False, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not your change at all but can you quickly check why this basic_artifact_content exist outside of the artifact_content fixture? seems odd to me that we need to have two fixtures for the same thing when it's pretty easy to parameterized them to have the information we'd want/need? (you don't need to fix anything if it might take long, but maybe file an issue to track cleaning this up if it is needed?) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, I can't immediately find any reason for this to exist either. It was added here http://reviews.delphix.com/r/48675/ before this was open-sourced. Neither the review nor the Jira ticket mentions anything about why this was required, instead of just using |
||
'minimumLuaVersion': '2.3', | ||
'sourceCode': 'UEsFBgAAAAAAAAAAAAAAAAAAAAAAAA==', | ||
'manifest': {} | ||
|
@@ -628,6 +638,7 @@ def artifact_content(engine_api, virtual_source_definition, | |
'rootSquashEnabled': True, | ||
'buildNumber': '2', | ||
'luaName': 'lua-toolkit-1', | ||
'extendedStartStopHooks': False, | ||
'minimumLuaVersion': '2.3', | ||
'manifest': {} | ||
} | ||
|
Uh oh!
There was an error while loading. Please reload this page.