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
Léo-Paul Géneau
slapos
Commits
792425a7
Commit
792425a7
authored
Aug 17, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner: exit import script if slapproxy database is emtpy on runner1 while trying to build SR
parent
8a30d6c1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/template/runner-import.sh.jinja2
software/slaprunner/template/runner-import.sh.jinja2
+6
-0
No files found.
software/slaprunner/buildout.hash.cfg
View file @
792425a7
...
@@ -22,7 +22,7 @@ md5sum = 04e31ac503753f89510dd412b4680c56
...
@@ -22,7 +22,7 @@ md5sum = 04e31ac503753f89510dd412b4680c56
[template-runner-import-script]
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
filename = template/runner-import.sh.jinja2
md5sum =
e033845c9c24e4bb20caeedf19f9628a
md5sum =
95f870546037c32f5d81ef9895b2629b
[instance-runner-import]
[instance-runner-import]
filename = instance-runner-import.cfg.in
filename = instance-runner-import.cfg.in
...
...
software/slaprunner/template/runner-import.sh.jinja2
View file @
792425a7
...
@@ -132,6 +132,12 @@ SLAPOS='{{ directory["bin"] }}'/slapos
...
@@ -132,6 +132,12 @@ SLAPOS='{{ directory["bin"] }}'/slapos
# XXX hardcoded
# XXX hardcoded
SQLITE3="$HOME/software_release/parts/sqlite3/bin/sqlite3"
SQLITE3="$HOME/software_release/parts/sqlite3/bin/sqlite3"
DATABASE="$HOME/srv/runner/proxy.db"
DATABASE="$HOME/srv/runner/proxy.db"
# If slapproxy database is empty then no software release was opened
if [ ! -s "$DATABASE" ]; then
log_message "Slapproxy database empty, no Software Requested... Writing status file... End"
echo 0 > $RESTORE_EXIT_CODE_FILE
exit 0
fi
# Change slapproxy database to point instances to new software release
# Change slapproxy database to point instances to new software release
# XXX hardcoded
# XXX hardcoded
PARTITION=$(basename $HOME)
PARTITION=$(basename $HOME)
...
...
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