Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos
Commits
85a521b6
Commit
85a521b6
authored
Nov 30, 2020
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
Slaprunner/Theia File Hierarchy Convergence
See merge request
nexedi/slapos!865
parents
6a098c09
d1b828e8
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
8 deletions
+16
-8
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+6
-0
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+1
-1
software/theia/instance.cfg.in
software/theia/instance.cfg.in
+4
-4
software/theia/software.cfg
software/theia/software.cfg
+2
-0
software/theia/test/test.py
software/theia/test/test.py
+2
-2
No files found.
software/slaprunner/buildout.hash.cfg
View file @
85a521b6
...
...
@@ -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
View file @
85a521b6
...
...
@@ -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
View file @
85a521b6
...
...
@@ -15,7 +15,7 @@
[instance]
filename = instance.cfg.in
md5sum =
0a9b4eb0234339a7ab6098ca4b5caddf
md5sum =
1c60191f8724854f979a17d2624e65d8
[yarn.lock]
filename = yarn.lock
...
...
software/theia/instance.cfg.in
View file @
85a521b6
...
...
@@ -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
View file @
85a521b6
...
...
@@ -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
View file @
85a521b6
...
...
@@ -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
...
'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment