Slaprunner/Theia File Hierarchy Convergence

See merge request nexedi/slapos!865

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 6e279c46b07bf56b7b037a8ee2c6587e
+md5sum = 2582723c31166244ff25cb3d8c839ffa
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -46,6 +46,7 @@ common-runner-parts =
   custom-frontend-promise
 {% endif %}
 {% endif %}
+  project-link
 ## Monitoring part
   monitor-base
   monitor-check-webrunner-internal-instance
@@ -159,6 +160,11 @@ software-test = $${:test}/software
 instance-test = $${:test}/instance
 sessions = $${buildout:directory}/.sessions
 
+[project-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = $${directory:srv}
+link-binary = $${runnerdirectory:project}
+
 [slaprunner]
 slaprunner = ${buildout:bin-directory}/slaprunner
 slapos = ${buildout:bin-directory}/slapos

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = 0a9b4eb0234339a7ab6098ca4b5caddf
+md5sum = 1c60191f8724854f979a17d2624e65d8
 
 [yarn.lock]
 filename = yarn.lock

software/theia/instance.cfg.in

@@ -286,8 +286,8 @@ command =
 ipv4 = $${instance-parameter:ipv4-random}
 ipv6 = $${instance-parameter:ipv6-random}
 port = 4000
-slapos-configuration = $${directory:slapos}/etc/slapos.cfg
-computer-id = local
+slapos-configuration = $${directory:runner}/etc/slapos.cfg
+computer-id = slaprunner
 
 [slapos-standalone-activate]
 recipe = slapos.recipe.template:jinja2
@@ -308,7 +308,7 @@ template =
   inline:#!/bin/sh
   export PATH=${buildout:bin-directory}:$PATH
   exec ${slapos-standalone:script-path} \
-      $${directory:slapos} \
+      $${directory:runner} \
       $${slapos-standalone-config:ipv4} \
       $${slapos-standalone-config:ipv6} \
       $${slapos-standalone-config:port} \
@@ -403,8 +403,8 @@ dot-theia = $${buildout:directory}/.theia/
 pidfiles = $${:var}/run
 
 services = $${:etc}/service
+runner = $${:srv}/runner
 project = $${:srv}/project
-slapos = $${:srv}/slapos
 frontend-static = $${:srv}/frontend-static
 frontend-static-public = $${:frontend-static}/public
 frontend-static-css = $${:frontend-static}/css

software/theia/software.cfg

@@ -97,6 +97,8 @@ initialization =
       args.server_port,
       computer_id=args.computer_id,
       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,
   )
   standalone.start()

software/theia/test/test.py

@@ -114,11 +114,11 @@ class TestTheia(SlapOSInstanceTestCase):
         pass
     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
     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(
         'Requesting software installation of https://lab.nexedi.com/nexedi/slapos/raw/1.0.144/software/helloworld/software.cfg...'