Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
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
Guillaume Hervier
slapos.package
Commits
44c00301
Commit
44c00301
authored
Apr 26, 2017
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
packer: Fix debian8 image generation
parent
e3cfd3ec
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
packer/debian8-testing-version.json
packer/debian8-testing-version.json
+2
-2
packer/debian8-vm-boostrap.json
packer/debian8-vm-boostrap.json
+2
-2
packer/scripts/setup-testing-version.sh
packer/scripts/setup-testing-version.sh
+9
-9
No files found.
packer/debian8-testing-version.json
View file @
44c00301
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
"accelerator"
:
"kvm"
,
"accelerator"
:
"kvm"
,
"disk_size"
:
"{{ user `disk_size`}}"
,
"disk_size"
:
"{{ user `disk_size`}}"
,
"iso_url"
:
"http://cdimage.debian.org/debian-cd/8.
3.0/amd64/iso-cd/debian-8.3.0
-amd64-netinst.iso"
,
"iso_url"
:
"http://cdimage.debian.org/debian-cd/8.
7.1/amd64/iso-cd/debian-8.7.1
-amd64-netinst.iso"
,
"iso_checksum"
:
"
a9b490b4215d1e72e876b031dafa7184
"
,
"iso_checksum"
:
"
453312bf56fc45669fec5ebc0f025ac7
"
,
"iso_checksum_type"
:
"md5"
,
"iso_checksum_type"
:
"md5"
,
"http_directory"
:
"http"
,
"http_directory"
:
"http"
,
...
...
packer/debian8-vm-boostrap.json
View file @
44c00301
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
"accelerator"
:
"kvm"
,
"accelerator"
:
"kvm"
,
"disk_size"
:
"{{ user `disk_size`}}"
,
"disk_size"
:
"{{ user `disk_size`}}"
,
"iso_url"
:
"http://cdimage.debian.org/debian-cd/8.
6.0/amd64/iso-cd/debian-8.6.0
-amd64-netinst.iso"
,
"iso_url"
:
"http://cdimage.debian.org/debian-cd/8.
7.1/amd64/iso-cd/debian-8.7.1
-amd64-netinst.iso"
,
"iso_checksum"
:
"
e9f61bf327db6d8f7cee05a99f2353cc
"
,
"iso_checksum"
:
"
453312bf56fc45669fec5ebc0f025ac7
"
,
"iso_checksum_type"
:
"md5"
,
"iso_checksum_type"
:
"md5"
,
"http_directory"
:
"http"
,
"http_directory"
:
"http"
,
...
...
packer/scripts/setup-testing-version.sh
View file @
44c00301
...
@@ -4,28 +4,28 @@ cat << EOF > /root/run-test
...
@@ -4,28 +4,28 @@ cat << EOF > /root/run-test
BOOTSTRAP="/root/start-bootstrap"
BOOTSTRAP="/root/start-bootstrap"
FILE="/etc/cron.d/ansible-vm-bootstrap"
FILE="/etc/cron.d/ansible-vm-bootstrap"
if [[ ! -f "
$BOOTSTRAP
" ]]
if [[ ! -f "
\
$
BOOTSTRAP" ]]
then
then
exit 1
exit 1
fi
fi
# Check if playbook has been correctly extracted
# Check if playbook has been correctly extracted
COUNT=
$(
ls
/opt/slapos.playbook |
wc
-l
)
COUNT=
\
$
(ls /opt/slapos.playbook | wc -l)
if [[ !
$COUNT
-gt 1 ]]
if [[ !
\
$
COUNT -gt 1 ]]
then
then
rm -f
$FILE
rm -f
\
$
FILE
rm -f /opt/slapos.playbook/playbook.tar.gz
rm -f /opt/slapos.playbook/playbook.tar.gz
fi
fi
lf=/tmp/pidLockFile
lf=/tmp/pidLockFile
cat /dev/null >>
$lf
cat /dev/null >>
\
$
lf
read lastPID <
$lf
read lastPID <
\
$
lf
# if lastPID is not null and a process with that pid exists , exit
# if lastPID is not null and a process with that pid exists , exit
[ ! -z "
$lastPID
" -a -d /proc/
$lastPID
] && exit
[ ! -z "
\$
lastPID" -a -d /proc/
\
$
lastPID ] && exit
# save my pid in the lock file
# save my pid in the lock file
echo
$$
>
$lf
echo
\$\$
>
\
$
lf
if [[ -f "
$FILE
" ]] && [[ -s "
$FILE
" ]] && [[
$COUNT
-gt 1 ]]
if [[ -f "
\$
FILE" ]] && [[ -s "
\$
FILE" ]] && [[
\
$
COUNT -gt 1 ]]
then
then
rm /etc/cron.d/vm-boostrap
rm /etc/cron.d/vm-boostrap
fi
fi
...
...
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