Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
eae1e861
Commit
eae1e861
authored
Sep 14, 2017
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
deploy-test: Allow to use local slapos clone
Also expose location of playbook.
parent
471e6927
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
5 deletions
+25
-5
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
+1
-0
software/erp5testnode/testsuite/deploy-test/software.cfg
software/erp5testnode/testsuite/deploy-test/software.cfg
+14
-5
software/erp5testnode/testsuite/deploy-test/standalone-local-playbook
...5testnode/testsuite/deploy-test/standalone-local-playbook
+10
-0
No files found.
software/erp5testnode/testsuite/deploy-test/instance.cfg.in
View file @
eae1e861
...
@@ -20,6 +20,7 @@ command =
...
@@ -20,6 +20,7 @@ command =
if [ ! -d srv/public ] ; then
if [ ! -d srv/public ] ; then
dest=`echo ../*/srv/public`
dest=`echo ../*/srv/public`
cp ${playbook:output} $dest/playbook.tar.gz &&
cp ${playbook:output} $dest/playbook.tar.gz &&
cp ${slapos-tarball:output} $dest/slapos.tar.gz &&
cp ${standalone-local-playbook:location} $dest/standalone-local-playbook
cp ${standalone-local-playbook:location} $dest/standalone-local-playbook
fi
fi
...
...
software/erp5testnode/testsuite/deploy-test/software.cfg
View file @
eae1e861
...
@@ -6,6 +6,7 @@ parts =
...
@@ -6,6 +6,7 @@ parts =
template-deploy-test
template-deploy-test
runTestSuite_py
runTestSuite_py
playbook
playbook
slapos-tarball
[runTestSuite_py]
[runTestSuite_py]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
@@ -25,21 +26,29 @@ command =
...
@@ -25,21 +26,29 @@ command =
ln -s ${buildout:bin-directory}/pythonwitheggs ${:location}/python2.7
ln -s ${buildout:bin-directory}/pythonwitheggs ${:location}/python2.7
update-command = ${:command}
update-command = ${:command}
[
playbook
]
[
tarball
]
recipe = plone.recipe.command
recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
stop-on-error = true
environment = export PATH=${tar:location}/bin:${gzip:location}/bin:$PATH
environment = export PATH=${tar:location}/bin:${gzip:location}/bin:$PATH
location = ${buildout:parts-directory}/${:_buildout_section_name_}
output = ${:location}/playbook.tar.gz
command =
command =
${:environment}
${:environment}
rm -fr ${:location}
rm -fr ${:location}
mkdir -p ${:location}
mkdir -p ${:location}
cd ${
slapos-package:location}/playbook
cd ${
:input}
tar czf ${:output} .
tar czf ${:output} .
update-command = ${:command}
update-command = ${:command}
[playbook]
<= tarball
input = ${slapos-package:location}/playbook
output = ${:location}/playbook.tar.gz
[slapos-tarball]
<= tarball
input = ${slapos-repository:repository}
output = ${:location}/slapos.tar.gz
[test-location]
[test-location]
base = ${slapos-package:location}
base = ${slapos-package:location}
...
...
software/erp5testnode/testsuite/deploy-test/standalone-local-playbook
View file @
eae1e861
...
@@ -2178,6 +2178,7 @@ fi
...
@@ -2178,6 +2178,7 @@ fi
sed
-i
"s/key = slapos-global-key/key = slapos-global-official-vifib-key/g"
/etc/opt/slapcache.cfg
sed
-i
"s/key = slapos-global-key/key = slapos-global-official-vifib-key/g"
/etc/opt/slapcache.cfg
DFILE
=
"/tmp/tmpplaybook_unstable
$(
basename
$0
)
.
$$
/"
DFILE
=
"/tmp/tmpplaybook_unstable
$(
basename
$0
)
.
$$
/"
PLAYBOOK_DIRECTORY
=
$DFILE
TFILE
=
"archive.tar.gz"
TFILE
=
"archive.tar.gz"
mkdir
-p
$DFILE
mkdir
-p
$DFILE
cd
$DFILE
cd
$DFILE
...
@@ -2185,7 +2186,16 @@ wget -O $TFILE http://10.0.2.100/playbook.tar.gz
...
@@ -2185,7 +2186,16 @@ wget -O $TFILE http://10.0.2.100/playbook.tar.gz
tar
-xzvf
$TFILE
tar
-xzvf
$TFILE
rm
$TFILE
rm
$TFILE
DFILE
=
"/test/slapos/"
TFILE
=
"archive.tar.gz"
mkdir
-p
$DFILE
cd
$DFILE
wget
-O
$TFILE
http://10.0.2.100/slapos.tar.gz
tar
-xzvf
$TFILE
rm
$TFILE
clear
clear
echo
"Starting Ansible playbook:"
echo
"Starting Ansible playbook:"
cd
$PLAYBOOK_DIRECTORY
ansible-playbook
$TEST_YML_PATH
-i
hosts
--connection
=
local
ansible-playbook
$TEST_YML_PATH
-i
hosts
--connection
=
local
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