Commit 65cf4aec authored by Xavier Thompson's avatar Xavier Thompson

[tmp] Add software-py3.cfg

parent 8c0ffedc
[buildout]
extends =
software.cfg
[python]
part = python3
......@@ -223,7 +223,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
[python-language-server-requirements.txt]
<= template-base
<= download-base
[theia]
recipe = plone.recipe.command
......@@ -253,16 +253,16 @@ install =
os.chmod(destination_dir, 0o750)
[yarn.lock]
<= template-base
<= download-base
[preloadTemplate.html]
<= template-base
<= download-base
[slapos.css.in]
<= template-base
<= download-base
[logo.png]
<= template-base
<= download-base
[package.json]
recipe = slapos.recipe.template:jinja2
......
......@@ -41,13 +41,15 @@ import pexpect
import psutil
import requests
import sqlite3
import six
from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass, installSoftwareUrlList
from slapos.grid.svcbackend import getSupervisorRPC
from slapos.grid.svcbackend import _getSupervisordSocketPath
theia_software_release_url = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))
theia_software_release_url = os.path.abspath(os.path.join(
os.path.dirname(__file__), '..', 'software%s.cfg' % ('-py3' if six.PY3 else '')))
erp5_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.187/software/erp5/software.cfg'
_, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(theia_software_release_url)
......@@ -56,7 +58,7 @@ def setUpModule():
installSoftwareUrlList(
SlapOSInstanceTestCase,
[theia_software_release_url, erp5_software_release_url],
debug=bool(int(os.environ.get('SLAPOS_TEST_DEBUG', 0))),
debug=bool(int(os.environ.get('SLAPOS_TEST_DEBUG', six.PY3))),
)
......
  • Now, it fails because of rdiff-backup. You must rebase on top of 3216cb3a (or newer).

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