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
Eteri
slapos
Commits
0bd48183
Commit
0bd48183
authored
Feb 12, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nayuos: Add error message shown in the runner's services logs.
parent
298929a1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
instance.cfg
instance.cfg
+1
-1
scripts/cros_full_build.in
scripts/cros_full_build.in
+2
-2
software.cfg
software.cfg
+1
-1
No files found.
instance.cfg
View file @
0bd48183
...
...
@@ -52,7 +52,7 @@ logo_dir = {{ logo_dir }}
recipe = slapos.recipe.template:jinja2
template = {{ scripts_dir }}/cros_full_build.in
rendered = ${directory:run}/cros_full_build
md5sum =
8ffa46a4b8a7cc6fa4f7e61eb20bdcbe
md5sum =
76942f32e682b36397b41db28297625d
mode = 0770
context =
# for access to the eggs from the instance
...
...
scripts/cros_full_build.in
View file @
0bd48183
...
...
@@ -27,7 +27,7 @@ TEST_LOG={{ instance_log_dir }}/tests_nayuos_image.log
cd
{{
cros_location
}}
/
{{
branch
}}
# create chroot environment (exit on failure)
cros_sdk
--download
||
exit
1
cros_sdk
--download
||
{
echo
"Problem entering chroot or downloading chroot environment. Exiting."
;
exit
1
;
}
# compile Python with sqlite support (-> change USE flag) for dev-lang/python
# it is needed by re6st
...
...
@@ -134,7 +134,7 @@ for board in ${BOARDS} ; do
&&
cros_sdk
--
rm
-f
$NAYU_IMAGE_LOCATION
&&
cros_sdk
--
touch
$NAYU_IMAGE_LOCATION
\
&&
cros_sdk
--
cros flash
--board
=
${
board
}
file://
$NAYU_IMAGE_LOCATION
>>
"
${
BUILD_LOG
}
"
\
&&
cros_sdk
--
./test_nayuos_image
${
board
}
>
"
${
TEST_LOG
}
"
\
||
exit
1
||
{
echo
"An error occured while building
${
board
}
NayuOS image. Exiting."
;
exit
1
;
}
# save ~15Go/device but delete cache (next build will be as long)
if
[
${
KEEP_CACHE
,,
}
==
"no"
]
;
then
...
...
software.cfg
View file @
0bd48183
...
...
@@ -35,7 +35,7 @@ command = sudo -V
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
md5sum =
47392f52ff3e2a907c511bf19b821051
md5sum =
d5a12b1ea814b4bb6792dfebaa655f90
mode = 0644
scripts_dir = ${:_profile_base_location_}/scripts
logo_dir = ${:_profile_base_location_}/logo
...
...
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