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
Jean-Paul Smets
slapos
Commits
728b46a3
Commit
728b46a3
authored
Feb 08, 2016
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nayuos: Add virtualenv.
parent
e0ae0bf5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
instance.cfg
instance.cfg
+1
-1
scripts/test_nayuos_image
scripts/test_nayuos_image
+11
-2
software.cfg
software.cfg
+1
-1
No files found.
instance.cfg
View file @
728b46a3
...
@@ -61,4 +61,4 @@ context =
...
@@ -61,4 +61,4 @@ context =
key ebuilds_dir directory:ebuilds_dir
key ebuilds_dir directory:ebuilds_dir
key scripts_dir directory:scripts_dir
key scripts_dir directory:scripts_dir
key logo_dir directory:logo_dir
key logo_dir directory:logo_dir
raw nayu_dev_packages net-libs/nodejs net-misc/re6stnet dev-vcs/git dev-python/flask sys-fs/cryptsetup
raw nayu_dev_packages net-libs/nodejs net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
\ No newline at end of file
\ No newline at end of file
scripts/test_nayuos_image
View file @
728b46a3
...
@@ -15,6 +15,7 @@ GRANDENET_SCRIPT="usr/local/bin/grandenet"
...
@@ -15,6 +15,7 @@ GRANDENET_SCRIPT="usr/local/bin/grandenet"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
BASHRC
=
"etc/skel/.bashrc"
BASHRC
=
"etc/skel/.bashrc"
EXPECTED_ALIAS
=
"alias git='git --exec-path=/usr/local/libexec/git-core/'"
EXPECTED_ALIAS
=
"alias git='git --exec-path=/usr/local/libexec/git-core/'"
VIRTUALENV_BIN
=
"usr/local/bin/virtualenv"
HAS_FAILED
=
0
HAS_FAILED
=
0
...
@@ -38,7 +39,7 @@ if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then
...
@@ -38,7 +39,7 @@ if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then
my_diff
=
$(
diff
${
ORIGINAL_GRANDENET_SCRIPT
}
"
${
MOUNTPOINT
}
/
${
GRANDENET_SCRIPT
}
"
)
my_diff
=
$(
diff
${
ORIGINAL_GRANDENET_SCRIPT
}
"
${
MOUNTPOINT
}
/
${
GRANDENET_SCRIPT
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
gitalias
=
$(
grep
"
${
EXPECTED_ALIAS
}
"
"
${
MOUNTPOINT
}
/
${
BASHRC
}
"
)
gitalias
=
$(
grep
"
${
EXPECTED_ALIAS
}
"
"
${
MOUNTPOINT
}
/
${
BASHRC
}
"
)
virtualenvbin
=
$(
ls
"
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
"
)
else
else
is_empty
=
1
is_empty
=
1
fi
fi
...
@@ -73,10 +74,18 @@ else
...
@@ -73,10 +74,18 @@ else
echo
"* test git quick fix for option --exec-path"
echo
"* test git quick fix for option --exec-path"
if
[[
${
gitalias
}
==
""
]]
;
then
if
[[
${
gitalias
}
==
""
]]
;
then
print_result
${
FAILURE
}
"Expected alias for git command not
present
in
${
MOUNTPOINT
}
/
${
BASHRC
}
. Should be:
${
EXPECTED_ALIAS
}
"
print_result
${
FAILURE
}
"Expected alias for git command not in
${
MOUNTPOINT
}
/
${
BASHRC
}
. Should be:
${
EXPECTED_ALIAS
}
"
else
else
print_result
${
SUCCESS
}
"git alias is correct."
print_result
${
SUCCESS
}
"git alias is correct."
fi
fi
echo
"* test if virtualenv binary exists"
if
[[
${
virtualenvbin
}
]]
;
then
print_result
${
SUCCESS
}
"virtualenv binary exists."
else
print_result
${
FAILURE
}
"Expected virtualenv binary not in
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
."
fi
fi
fi
exit
${
HAS_FAILED
}
exit
${
HAS_FAILED
}
software.cfg
View file @
728b46a3
...
@@ -35,7 +35,7 @@ command = sudo -V
...
@@ -35,7 +35,7 @@ command = sudo -V
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg
template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
md5sum =
b09c445b15f87a91cb5b4b2b582e7c17
md5sum =
ef241340bf055a65f639a8f2775f52e0
mode = 0644
mode = 0644
scripts_dir = ${:_profile_base_location_}/scripts
scripts_dir = ${:_profile_base_location_}/scripts
ebuilds_dir = ${:_profile_base_location_}/custom_ebuilds
ebuilds_dir = ${:_profile_base_location_}/custom_ebuilds
...
...
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