Commit 85a521b6 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

Slaprunner/Theia File Hierarchy Convergence

See merge request nexedi/slapos!865
parents 6a098c09 d1b828e8
Pipeline #12541 failed with stage
...@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24 ...@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
[template-runner] [template-runner]
filename = instance-runner.cfg filename = instance-runner.cfg
md5sum = 6e279c46b07bf56b7b037a8ee2c6587e md5sum = 2582723c31166244ff25cb3d8c839ffa
[template-runner-import-script] [template-runner-import-script]
filename = template/runner-import.sh.jinja2 filename = template/runner-import.sh.jinja2
......
...@@ -46,6 +46,7 @@ common-runner-parts = ...@@ -46,6 +46,7 @@ common-runner-parts =
custom-frontend-promise custom-frontend-promise
{% endif %} {% endif %}
{% endif %} {% endif %}
project-link
## Monitoring part ## Monitoring part
monitor-base monitor-base
monitor-check-webrunner-internal-instance monitor-check-webrunner-internal-instance
...@@ -159,6 +160,11 @@ software-test = $${:test}/software ...@@ -159,6 +160,11 @@ software-test = $${:test}/software
instance-test = $${:test}/instance instance-test = $${:test}/instance
sessions = $${buildout:directory}/.sessions sessions = $${buildout:directory}/.sessions
[project-link]
recipe = slapos.cookbook:symbolic.link
target-directory = $${directory:srv}
link-binary = $${runnerdirectory:project}
[slaprunner] [slaprunner]
slaprunner = ${buildout:bin-directory}/slaprunner slaprunner = ${buildout:bin-directory}/slaprunner
slapos = ${buildout:bin-directory}/slapos slapos = ${buildout:bin-directory}/slapos
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 0a9b4eb0234339a7ab6098ca4b5caddf md5sum = 1c60191f8724854f979a17d2624e65d8
[yarn.lock] [yarn.lock]
filename = yarn.lock filename = yarn.lock
......
...@@ -286,8 +286,8 @@ command = ...@@ -286,8 +286,8 @@ command =
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 slapos-configuration = $${directory:runner}/etc/slapos.cfg
computer-id = local computer-id = slaprunner
[slapos-standalone-activate] [slapos-standalone-activate]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -308,7 +308,7 @@ template = ...@@ -308,7 +308,7 @@ template =
inline:#!/bin/sh inline:#!/bin/sh
export PATH=${buildout:bin-directory}:$PATH export PATH=${buildout:bin-directory}:$PATH
exec ${slapos-standalone:script-path} \ exec ${slapos-standalone:script-path} \
$${directory:slapos} \ $${directory:runner} \
$${slapos-standalone-config:ipv4} \ $${slapos-standalone-config:ipv4} \
$${slapos-standalone-config:ipv6} \ $${slapos-standalone-config:ipv6} \
$${slapos-standalone-config:port} \ $${slapos-standalone-config:port} \
...@@ -403,8 +403,8 @@ dot-theia = $${buildout:directory}/.theia/ ...@@ -403,8 +403,8 @@ dot-theia = $${buildout:directory}/.theia/
pidfiles = $${:var}/run pidfiles = $${:var}/run
services = $${:etc}/service services = $${:etc}/service
runner = $${:srv}/runner
project = $${:srv}/project project = $${:srv}/project
slapos = $${:srv}/slapos
frontend-static = $${:srv}/frontend-static frontend-static = $${:srv}/frontend-static
frontend-static-public = $${:frontend-static}/public frontend-static-public = $${:frontend-static}/public
frontend-static-css = $${:frontend-static}/css frontend-static-css = $${:frontend-static}/css
......
...@@ -97,6 +97,8 @@ initialization = ...@@ -97,6 +97,8 @@ initialization =
args.server_port, args.server_port,
computer_id=args.computer_id, computer_id=args.computer_id,
shared_part_list=shared_part_list, shared_part_list=shared_part_list,
software_root="%s/software" % args.base_directory,
instance_root="%s/instance" % args.base_directory,
partition_forward_configuration=partition_forward_configuration, partition_forward_configuration=partition_forward_configuration,
) )
standalone.start() standalone.start()
......
...@@ -114,11 +114,11 @@ class TestTheia(SlapOSInstanceTestCase): ...@@ -114,11 +114,11 @@ class TestTheia(SlapOSInstanceTestCase):
pass pass
process.logfile = DebugLogFile() process.logfile = DebugLogFile()
process.expect_exact('Standalone SlapOS for computer `local` activated') process.expect_exact('Standalone SlapOS for computer `slaprunner` activated')
# try to supply and install a software to check that this slapos is usable # try to supply and install a software to check that this slapos is usable
process.sendline( process.sendline(
'slapos supply https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg local' 'slapos supply https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg slaprunner'
) )
process.expect( process.expect(
'Requesting software installation of https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg...' 'Requesting software installation of https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg...'
......
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