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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos
Commits
2d9fd069
Commit
2d9fd069
authored
Feb 04, 2016
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X <instance>/bin/runTestSuite generation draftly works
parent
8f26141d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
13 deletions
+33
-13
software/neoppod/instance-common.cfg.in
software/neoppod/instance-common.cfg.in
+1
-0
software/neoppod/instance-neo-storage-mysql.cfg.in
software/neoppod/instance-neo-storage-mysql.cfg.in
+12
-0
software/neoppod/runTestSuite.in
software/neoppod/runTestSuite.in
+3
-1
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+3
-2
software/neoppod/software-neoppod-testnode.cfg
software/neoppod/software-neoppod-testnode.cfg
+14
-10
No files found.
software/neoppod/instance-common.cfg.in
View file @
2d9fd069
...
...
@@ -41,3 +41,4 @@ extra-context =
key admin_cfg neo-admin:rendered
raw mariadb_location {{ mariadb_location }}
raw template_neo_my_cnf {{ template_neo_my_cnf }}
raw runTestSuite_in {{ runTestSuite_in }}
software/neoppod/instance-neo-storage-mysql.cfg.in
View file @
2d9fd069
...
...
@@ -27,6 +27,17 @@ rendered = ${directory:etc}/mariadb.cnf
template = {{ template_neo_my_cnf }}
context = section parameter_dict my-cnf-parameters
# bin/runTestSuite to run NEO tests
[runTestSuite]
recipe = slapos.recipe.template:jinja2
extensions = jinja2.ext.do
rendered = ${directory:bin}/${:_buildout_section_name_}
template = {{ runTestSuite_in }}
mode = 0755
context =
section my_cnf_parameters my-cnf-parameters
{% set master_list = [] -%}
{% set admin_list = [] -%}
{% for k, v in slapparameter_dict.iteritems() -%}
...
...
@@ -146,3 +157,4 @@ extends =
parts +=
{{ '\n '.join(part_list) }}
logrotate-mysql
runTestSuite
software/neoppod/runTestSuite.in
View file @
2d9fd069
#!/bin/bash
echo
"Works?"
echo
"WorkS3333332?"
export
MYSQL_UNIX_PORT
={{
my_cnf_parameters.socket
}}
software/neoppod/software-common.cfg
View file @
2d9fd069
...
...
@@ -76,7 +76,7 @@ mode = 644
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:_buildout_section_name_}.cfg.in
rendered = ${buildout:directory}/${:_buildout_section_name_}.cfg
md5sum = e8f5a83580e9791a32c66f5935cb6840
#
md5sum = e8f5a83580e9791a32c66f5935cb6840
context =
key bin_directory buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
...
...
@@ -87,6 +87,7 @@ context =
key neo_storage_mysql instance-neo-storage-mysql:target
key template_logrotate_base template-logrotate-base:rendered
key template_neo_my_cnf template-neo-my-cnf:target
key runTestSuite_in runTestSuite.in:target
[root-common]
<= download-base-neo
...
...
@@ -102,7 +103,7 @@ md5sum = 82f3f76f54ee9db355966a7ada61f56e
[instance-neo-storage-mysql]
<= download-base-neo
md5sum = 84b1150ce30ec827485f9c17debd6b44
#
md5sum = 84b1150ce30ec827485f9c17debd6b44
[template-neo-my-cnf]
<= download-base-neo
...
...
software/neoppod/software-neoppod-testnode.cfg
View file @
2d9fd069
...
...
@@ -4,13 +4,17 @@ extends =
software.cfg
parts + =
runTestSuite
runTestSuite
.in
[runTestSuite]
recipe = slapos.recipe.template:jinja2
template= ${:_profile_base_location_}/${:_buildout_section_name_}.in
rendered= ${buildout:bin-directory}/${:_buildout_section_name_}
mode = 0755
#md5sum = 2986dcb006dc9e8508ff81f646656131
#context =
# section bash bash
# macro: download a file named as section name
# XXX dup from software/gitlab/software.cfg
[download-file]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:_buildout_section_name_}
destination = ${buildout:directory}/${:_buildout_section_name_}
[runTestSuite.in]
<= download-file
#md5sum = ... TODO
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