Commit 946f2ac9 authored by Jérome Perrin's avatar Jérome Perrin

software/theia: tasks to control embedded slapos

Introduce an easy way to run slapos commands in a more integrated way.
parent 6c1ef6a7
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = d8ad39bc93c492026a93c28b33a5dc3a md5sum = d6f7d1607641bee3543cebc04db73472
[yarn.lock] [yarn.lock]
filename = yarn.lock filename = yarn.lock
......
...@@ -3,6 +3,7 @@ parts = ...@@ -3,6 +3,7 @@ parts =
monitor-base monitor-base
promises promises
frontend-reload frontend-reload
tasks.json
publish-connection-parameter publish-connection-parameter
extends = ${monitor-template:rendered} extends = ${monitor-template:rendered}
...@@ -114,6 +115,69 @@ install = ...@@ -114,6 +115,69 @@ install =
location = $${directory:frontend-static}/$${:filename} location = $${directory:frontend-static}/$${:filename}
filename = $${:_buildout_section_name_} filename = $${:_buildout_section_name_}
[tasks.json]
recipe = slapos.recipe.template:jinja2
rendered = $${directory:dot-theia}/tasks.json
template =
inline:
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "slapos node software",
"detail": "Build all software supplied to the node",
"type": "shell",
"command": "${buildout:bin-directory}/slapos",
"args": [
"node",
"software",
// debug mode can be enabled by commenting out this line:
// "--buildout-debug",
"--all"
],
"options": {
"env": {
"SLAPOS_CONFIGURATION": "$${slapos-standalone-activate:slapos-configuration}",
"GIT_EXEC_PATH": ""
}
},
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": []
},
{
"label": "slapos node instance",
"detail": "Create all instances requested on the node",
"type": "shell",
"command": "${buildout:bin-directory}/slapos",
"args": [
"node",
"instance",
// debug mode can be enabled by commenting out this line:
// "--buildout-debug",
"--all"
],
"options": {
"env": {
"SLAPOS_CONFIGURATION": "$${slapos-standalone-activate:slapos-configuration}",
"GIT_EXEC_PATH": ""
}
},
"problemMatcher": [],
"group": {
"kind": "build",
  • @jerome Why not put test here so that we can directly call "Run Build Task..." and "Run Test Task.."

    Edited by Cédric Le Ninivin
  • Yes, maybe, I did not try much here. Semantically it may be a bit more "build" (building the instance) than "test" (testing to build the instance). I was really experimenting with these tasks, we can improve them ( also slapos node report is missing )

Please register or sign in to reply
"isDefault": true
}
}
]
}
[user] [user]
recipe = slapos.cookbook:userinfo recipe = slapos.cookbook:userinfo
...@@ -163,13 +227,13 @@ template = ...@@ -163,13 +227,13 @@ template =
$${slap-connection:partition-id} \ $${slap-connection:partition-id} \
--key='$${slap-connection:key-file}' \ --key='$${slap-connection:key-file}' \
--cert='$${slap-connection:cert-file}' --cert='$${slap-connection:cert-file}'
export SLAPOS_CONFIGURATION=$${directory:slapos}/etc/slapos.cfg export SLAPOS_CONFIGURATION=$${:slapos-configuration}
export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
ipv4 = $${instance-parameter:ipv4-random} ipv4 = $${instance-parameter:ipv4-random}
ipv6 = $${instance-parameter:ipv6-random} ipv6 = $${instance-parameter:ipv6-random}
port = 4000 port = 4000
slapos-configuration = $${directory:slapos}/etc/slapos.cfg
[promises] [promises]
recipe = recipe =
...@@ -233,6 +297,7 @@ var = $${buildout:directory}/var ...@@ -233,6 +297,7 @@ var = $${buildout:directory}/var
srv = $${buildout:directory}/srv srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin bin = $${buildout:directory}/bin
tmp = $${buildout:directory}/tmp tmp = $${buildout:directory}/tmp
dot-theia = $${buildout:directory}/.theia/
pidfiles = $${:var}/run pidfiles = $${:var}/run
services = $${:etc}/service services = $${:etc}/service
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment