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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos
Commits
3bf7aaf7
Commit
3bf7aaf7
authored
Mar 24, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
795cca78
67725752
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
39 additions
and
7 deletions
+39
-7
setup.py
setup.py
+1
-1
slapos/recipe/_urlparse.py
slapos/recipe/_urlparse.py
+1
-1
slapos/test/recipe/test_urlparse.py
slapos/test/recipe/test_urlparse.py
+21
-0
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+3
-0
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+2
-2
software/theia/instance-output-schema.json
software/theia/instance-output-schema.json
+4
-0
software/theia/instance-resilient.cfg.jinja
software/theia/instance-resilient.cfg.jinja
+2
-1
software/theia/instance-theia.cfg.jinja.in
software/theia/instance-theia.cfg.jinja.in
+2
-2
software/theia/test/test.py
software/theia/test/test.py
+3
-0
No files found.
setup.py
View file @
3bf7aaf7
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'1.0.2
2
6'
version
=
'1.0.2
3
6'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.rst"
).
read
()
long_description
=
open
(
"README.rst"
).
read
()
...
...
slapos/recipe/_urlparse.py
View file @
3bf7aaf7
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
##############################################################################
##############################################################################
from
url
parse
import
urlparse
from
six.moves.urllib.
parse
import
urlparse
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
...
...
slapos/test/recipe/test_urlparse.py
0 → 100755
View file @
3bf7aaf7
import
unittest
import
zc.buildout.testing
class
UrlparseTest
(
unittest
.
TestCase
):
def
setUp
(
self
):
self
.
buildout
=
buildout
=
zc
.
buildout
.
testing
.
Buildout
()
buildout
[
'urlinfo'
]
=
{}
buildout
[
'urlinfo'
][
'url'
]
=
"http://www.google.com/search?hl=en&q=urlparse&btnG=Google+Search"
from
slapos.recipe
import
_urlparse
self
.
recipe
=
_urlparse
.
Recipe
(
buildout
,
"urlinfo"
,
buildout
[
'urlinfo'
])
def
test_options
(
self
):
buildout
=
self
.
buildout
self
.
assertTrue
(
buildout
[
'urlinfo'
])
self
.
assertEqual
(
buildout
[
'urlinfo'
][
'path'
],
'search'
)
self
.
assertEqual
(
buildout
[
'urlinfo'
][
'scheme'
],
'http'
)
self
.
assertEqual
(
buildout
[
'urlinfo'
][
'host'
],
'www.google.com'
)
self
.
assertEqual
(
buildout
[
'urlinfo'
][
'query'
],
'hl=en&q=urlparse&btnG=Google+Search'
)
def
test_install
(
self
):
self
.
assertEqual
(
self
.
recipe
.
install
(),
[])
software/caddy-frontend/test/test.py
View file @
3bf7aaf7
...
@@ -6674,6 +6674,9 @@ class TestPassedRequestParameter(HttpFrontendTestCase):
...
@@ -6674,6 +6674,9 @@ class TestPassedRequestParameter(HttpFrontendTestCase):
're6st-verification-url'
:
're6st-verification-url'
,
're6st-verification-url'
:
're6st-verification-url'
,
'request-timeout'
:
'100'
,
'request-timeout'
:
'100'
,
'root_instance_title'
:
'testing partition 0'
,
'root_instance_title'
:
'testing partition 0'
,
'slap_computer_id'
:
'local'
,
'slap_computer_partition_id'
:
'T-0'
,
'slap_software_release_url'
:
base_software_url
,
'slap_software_type'
:
'RootSoftwareInstance'
,
'slap_software_type'
:
'RootSoftwareInstance'
,
'slave_instance_list'
:
[]
'slave_instance_list'
:
[]
}
}
...
...
software/theia/buildout.hash.cfg
View file @
3bf7aaf7
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance-theia]
[instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in
_update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum =
4df9f0d76a134a8abec9060a0c1be50b
md5sum =
00d15432c1486376d8ba7d0f5ec63c33
[instance]
[instance]
_update_hash_filename_ = instance.cfg.in
_update_hash_filename_ = instance.cfg.in
...
@@ -31,7 +31,7 @@ md5sum = b3f1dd83033d6a45def0bd26e70d5a9c
...
@@ -31,7 +31,7 @@ md5sum = b3f1dd83033d6a45def0bd26e70d5a9c
[instance-resilient]
[instance-resilient]
_update_hash_filename_ = instance-resilient.cfg.jinja
_update_hash_filename_ = instance-resilient.cfg.jinja
md5sum =
b1e338973bc9cfe1bb4e16d46b3c6da9
md5sum =
ad9499e7355ded4975ad313442cecb7a
[theia-common]
[theia-common]
_update_hash_filename_ = theia_common.py
_update_hash_filename_ = theia_common.py
...
...
software/theia/instance-output-schema.json
View file @
3bf7aaf7
...
@@ -17,6 +17,10 @@
...
@@ -17,6 +17,10 @@
"backend-url"
:
{
"backend-url"
:
{
"description"
:
"Theia Backend URL"
,
"description"
:
"Theia Backend URL"
,
"type"
:
"string"
"type"
:
"string"
},
"ipv6"
:
{
"description"
:
"A Theia ipv6 address"
,
"type"
:
"string"
}
}
},
},
"type"
:
"object"
"type"
:
"object"
...
...
software/theia/instance-resilient.cfg.jinja
View file @
3bf7aaf7
...
@@ -33,7 +33,7 @@ parts +=
...
@@ -33,7 +33,7 @@ parts +=
# Ask for the connection parameters of the main theia
# Ask for the connection parameters of the main theia
[request-theia]
[request-theia]
return += url username password backend-url
return += url username password backend-url
ipv6
# Publish connection parameters of the main theia and resiliency parameters
# Publish connection parameters of the main theia and resiliency parameters
...
@@ -43,6 +43,7 @@ url = ${request-theia:connection-url}
...
@@ -43,6 +43,7 @@ url = ${request-theia:connection-url}
username = ${request-theia:connection-username}
username = ${request-theia:connection-username}
password = ${request-theia:connection-password}
password = ${request-theia:connection-password}
backend-url = ${request-theia:connection-backend-url}
backend-url = ${request-theia:connection-backend-url}
ipv6 = ${request-theia:connection-ipv6}
monitor-base-url = ${monitor-publish:monitor-base-url}
monitor-base-url = ${monitor-publish:monitor-base-url}
monitor-setup-url = ${monitor-publish:monitor-setup-url}
monitor-setup-url = ${monitor-publish:monitor-setup-url}
<= publish-connection-information
<= publish-connection-information
software/theia/instance-theia.cfg.jinja.in
View file @
3bf7aaf7
...
@@ -37,7 +37,7 @@ additional-url = $${remote-additional-frontend:connection-secure_access}
...
@@ -37,7 +37,7 @@ additional-url = $${remote-additional-frontend:connection-secure_access}
username = $${frontend-instance-password:username}
username = $${frontend-instance-password:username}
password = $${frontend-instance-password:passwd}
password = $${frontend-instance-password:passwd}
backend-url = $${frontend-instance:url}
backend-url = $${frontend-instance:url}
ipv6 = {{ ipv6_random }}
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -353,7 +353,7 @@ template =
...
@@ -353,7 +353,7 @@ template =
#!/bin/sh
#!/bin/sh
export HOME=$${directory:home}
export HOME=$${directory:home}
export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
export IPV6_SLAPRUNNER={{ ipv6_random }}
# Theia Backend
# Theia Backend
# -------------
# -------------
...
...
software/theia/test/test.py
View file @
3bf7aaf7
...
@@ -125,6 +125,9 @@ class TestTheia(TheiaTestCase):
...
@@ -125,6 +125,9 @@ class TestTheia(TheiaTestCase):
resp = self.get(urljoin(authenticated_url, url))
resp = self.get(urljoin(authenticated_url, url))
self.assertTrue(resp.raw)
self.assertTrue(resp.raw)
def test_ipv6_parameter_published(self):
self.assertIn('
ipv6
', self.connection_parameters)
def test_theia_slapos(self):
def test_theia_slapos(self):
# Make sure we can use the shell and the integrated slapos command
# Make sure we can use the shell and the integrated slapos command
process = pexpect.spawnu(
process = pexpect.spawnu(
...
...
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