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
Titouan Soulard
slapos
Commits
591e5b14
Commit
591e5b14
authored
Jan 14, 2020
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DONOTMERGE: changes for running tests on correct branches + debug
parent
5678e7c0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
29 deletions
+19
-29
software/slapos-sr-testing/software.cfg
software/slapos-sr-testing/software.cfg
+2
-25
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-1
stack/slapos.cfg
stack/slapos.cfg
+15
-2
No files found.
software/slapos-sr-testing/software.cfg
View file @
591e5b14
...
@@ -159,6 +159,7 @@ recipe = zc.recipe.egg
...
@@ -159,6 +159,7 @@ recipe = zc.recipe.egg
eggs =
eggs =
${pycurl:egg}
${pycurl:egg}
${lxml-python:egg}
${lxml-python:egg}
${slapos.toolbox:egg}
${slapos.core-setup:egg}
${slapos.core-setup:egg}
${pillow-python:egg}
${pillow-python:egg}
erp5.util
erp5.util
...
@@ -207,7 +208,7 @@ forbid-download-cache = true
...
@@ -207,7 +208,7 @@ forbid-download-cache = true
[slapos-repository]
[slapos-repository]
<= git-clone-repository
<= git-clone-repository
repository = https://lab.nexedi.com/nexedi/slapos.git
repository = https://lab.nexedi.com/nexedi/slapos.git
branch =
maste
r
branch =
runner-multi-s
r
[template]
[template]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -223,31 +224,7 @@ context =
...
@@ -223,31 +224,7 @@ context =
key curl_location curl:location
key curl_location curl:location
key tests :tests
key tests :tests
tests =
tests =
${slapos.test.kvm-setup:setup}
${slapos.test.slaprunner-setup:setup}
${slapos.test.slaprunner-setup:setup}
${:extra}
extra =
${slapos.cookbook-setup:setup}
${slapos.test.backupserver-setup:setup}
${slapos.test.caddy-frontend-setup:setup}
${slapos.test.erp5-setup:setup}
${slapos.test.htmlvalidatorserver-setup:setup}
${slapos.test.slapos-master-setup:setup}
${slapos.test.plantuml-setup:setup}
${slapos.test.powerdns-setup:setup}
${slapos.test.proftpd-setup:setup}
${slapos.test.re6stnet-setup:setup}
${slapos.test.seleniumserver-setup:setup}
${slapos.test.helloworld-setup:setup}
${slapos.test.jstestnode-setup:setup}
${slapos.test.jupyter-setup:setup}
${slapos.test.nextcloud-setup:setup}
${slapos.test.turnserver-setup:setup}
${slapos.test.theia-setup:setup}
${slapos.test.grafana-setup:setup}
${slapos.test.gitlab-setup:setup}
${slapos.test.cloudooo-setup:setup}
${slapos.test.dream-setup:setup}
[versions]
[versions]
# slapos.core is used from the clone always
# slapos.core is used from the clone always
...
...
software/slaprunner/buildout.hash.cfg
View file @
591e5b14
...
@@ -18,7 +18,7 @@ md5sum = ec70348dd71b319590a5c5837f3d2e45
...
@@ -18,7 +18,7 @@ md5sum = ec70348dd71b319590a5c5837f3d2e45
[template-runner]
[template-runner]
filename = instance-runner.cfg
filename = instance-runner.cfg
md5sum =
f342daca2e87f8fa44fd7b6a2a1c22f8
md5sum =
e7d59488e5f67011985211d775a9c499
[template-runner-import-script]
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
filename = template/runner-import.sh.jinja2
...
...
software/slaprunner/instance-runner.cfg
View file @
591e5b14
...
@@ -640,7 +640,7 @@ frontend-domain =
...
@@ -640,7 +640,7 @@ frontend-domain =
slapos-repository = https://lab.nexedi.com/nexedi/slapos.git
slapos-repository = https://lab.nexedi.com/nexedi/slapos.git
slapos-software =
slapos-software =
slapos-software-type =
slapos-software-type =
slapos-reference =
1.0
slapos-reference =
runner-multi-sr
auto-deploy = false
auto-deploy = false
auto-deploy-instance = true
auto-deploy-instance = true
autorun = false
autorun = false
...
...
stack/slapos.cfg
View file @
591e5b14
...
@@ -77,6 +77,19 @@ versions = versions
...
@@ -77,6 +77,19 @@ versions = versions
# Define networkcache with shacache.org
# Define networkcache with shacache.org
networkcache-section = networkcache
networkcache-section = networkcache
[slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/Nicolas/slapos.toolbox.git
revision =
branch = runner-multi-sr
git-executable = ${git:location}/bin/git
develop = true
[slapos.toolbox]
recipe = zc.recipe.egg:develop
egg = slapos.toolbox
setup = ${slapos.toolbox-repository:location}
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/slapos.git
repository = https://lab.nexedi.com/nexedi/slapos.git
...
@@ -107,7 +120,7 @@ eggs =
...
@@ -107,7 +120,7 @@ eggs =
${lxml-python:egg}
${lxml-python:egg}
${pycurl:egg}
${pycurl:egg}
${python-cryptography:egg}
${python-cryptography:egg}
slapos.toolbox
${slapos.toolbox:egg}
# Install a slapos command with networkcache enabled in ${buildout:bin-directory}
# Install a slapos command with networkcache enabled in ${buildout:bin-directory}
[slapos-command]
[slapos-command]
...
@@ -163,7 +176,7 @@ slapos.libnetworkcache = 0.20
...
@@ -163,7 +176,7 @@ slapos.libnetworkcache = 0.20
slapos.rebootstrap = 4.4
slapos.rebootstrap = 4.4
slapos.recipe.build = 0.44
slapos.recipe.build = 0.44
slapos.recipe.cmmi = 0.13
slapos.recipe.cmmi = 0.13
slapos.toolbox =
0.109
slapos.toolbox =
stevedore = 1.21.0
stevedore = 1.21.0
subprocess32 = 3.5.3
subprocess32 = 3.5.3
unicodecsv = 0.14.1
unicodecsv = 0.14.1
...
...
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